[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix menubar visibility in drop-down mode

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 1d9f002d33006504362d95721a2ff0a0d99628f3
Author: Igor <f2404 at yandex.ru>
Date:   Mon Dec 26 16:48:20 2016 +0300

    Fix menubar visibility in drop-down mode
---
 terminal/terminal-window-dropdown.c |  1 +
 terminal/terminal-window.c          | 57 +++++++++++++++++++++----------------
 terminal/terminal-window.h          |  3 ++
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
index a2907b9..44b59dd 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -947,6 +947,7 @@ terminal_window_dropdown_new (const gchar        *role,
   gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), show_menubar);
   g_signal_connect_swapped (action, "activate",
       G_CALLBACK (terminal_window_dropdown_update_geometry), window);
+  terminal_window_action_show_menubar (GTK_TOGGLE_ACTION (action), window);
 
   /* setup toolbar visibility */
   if (G_LIKELY (toolbar != TERMINAL_VISIBILITY_DEFAULT))
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 9c1e73b..4a307b0 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -189,8 +189,6 @@ static void         terminal_window_action_select_all             (GtkAction
                                                                    TerminalWindow         *window);
 static void         terminal_window_action_prefs                  (GtkAction              *action,
                                                                    TerminalWindow         *window);
-static void         terminal_window_action_show_menubar           (GtkToggleAction        *action,
-                                                                   TerminalWindow         *window);
 static void         terminal_window_action_show_toolbar           (GtkToggleAction        *action,
                                                                    TerminalWindow         *window);
 static void         terminal_window_action_show_borders           (GtkToggleAction        *action,
@@ -505,6 +503,13 @@ terminal_window_init (TerminalWindow *window)
   g_signal_connect (G_OBJECT (window->priv->encoding_action), "encoding-changed",
       G_CALLBACK (terminal_window_action_set_encoding), window);
 
+  window->priv->menubar = gtk_ui_manager_get_widget (window->priv->ui_manager, "/main-menu");
+  gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->menubar, FALSE, FALSE, 0);
+  gtk_box_reorder_child (GTK_BOX (window->priv->vbox), window->priv->menubar, 0);
+  /* auto-hide menubar if it was shown temporarily */
+  g_signal_connect (G_OBJECT (window->priv->menubar), "deactivate",
+      G_CALLBACK (terminal_window_menubar_deactivate), window);
+
   /* cache action pointers */
   window->priv->action_undo_close_tab = terminal_window_get_action (window, "undo-close-tab");
   window->priv->action_detach_tab = terminal_window_get_action (window, "detach-tab");
@@ -1657,22 +1662,6 @@ terminal_window_action_prefs (GtkAction      *action,
 
 
 static void
-terminal_window_action_show_menubar (GtkToggleAction *action,
-                                     TerminalWindow  *window)
-{
-  terminal_window_size_push (window);
-
-  if (gtk_toggle_action_get_active (action))
-    gtk_widget_show (window->priv->menubar);
-  else
-    gtk_widget_hide (window->priv->menubar);
-
-  terminal_window_size_pop (window);
-}
-
-
-
-static void
 terminal_window_action_show_toolbar (GtkToggleAction *action,
                                      TerminalWindow  *window)
 {
@@ -2296,13 +2285,6 @@ terminal_window_new (const gchar       *role,
   if (fullscreen && gtk_action_is_sensitive (window->priv->action_fullscreen))
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (window->priv->action_fullscreen), TRUE);
 
-  window->priv->menubar = gtk_ui_manager_get_widget (window->priv->ui_manager, "/main-menu");
-  gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->menubar, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (window->priv->vbox), window->priv->menubar, 0);
-  /* auto-hide menubar if it was shown temporarily */
-  g_signal_connect (G_OBJECT (window->priv->menubar), "deactivate",
-      G_CALLBACK (terminal_window_menubar_deactivate), window);
-
   /* setup menubar visibility */
   if (G_LIKELY (menubar != TERMINAL_VISIBILITY_DEFAULT))
     show_menubar = (menubar == TERMINAL_VISIBILITY_SHOW);
@@ -2397,6 +2379,10 @@ terminal_window_get_active (TerminalWindow *window)
 
 
 
+/**
+ * terminal_window_notebook_show_tabs:
+ * @window  : A #TerminalWindow.
+ **/
 void
 terminal_window_notebook_show_tabs (TerminalWindow *window)
 {
@@ -2743,3 +2729,24 @@ terminal_window_rebuild_tabs_menu (TerminalWindow *window)
       window->priv->tabs_menu_actions = g_slist_prepend (window->priv->tabs_menu_actions, radio_action);
     }
 }
+
+
+
+/**
+ * terminal_window_action_show_menubar:
+ * @action  : A toggle action.
+ * @window  : A #TerminalWindow.
+ **/
+void
+terminal_window_action_show_menubar (GtkToggleAction *action,
+                                     TerminalWindow  *window)
+{
+  terminal_window_size_push (window);
+
+  if (gtk_toggle_action_get_active (action))
+    gtk_widget_show (window->priv->menubar);
+  else
+    gtk_widget_hide (window->priv->menubar);
+
+  terminal_window_size_pop (window);
+}
diff --git a/terminal/terminal-window.h b/terminal/terminal-window.h
index 942322f..0498ee1 100644
--- a/terminal/terminal-window.h
+++ b/terminal/terminal-window.h
@@ -98,6 +98,9 @@ gint               terminal_window_get_toolbar_height       (TerminalWindow
 
 void               terminal_window_rebuild_tabs_menu        (TerminalWindow     *window);
 
+void               terminal_window_action_show_menubar      (GtkToggleAction    *action,
+                                                             TerminalWindow     *window);
+
 G_END_DECLS
 
 #endif /* !TERMINAL_WINDOW_H */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.