[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix size increase when the menu is used on Wayland

[noreply at xfce.org]

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

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit 71bc9086016062faa90485d27d4fe522609d44d7
Author: Igor <f2404 at yandex.ru>
Date:   Mon Sep 16 16:06:37 2019 -0400

    Fix size increase when the menu is used on Wayland
    
    Fixes bug #13938
---
 terminal/terminal-window.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 5491ff3..0dc04d5 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -3299,20 +3299,24 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gboolean show = gtk_toggle_action_get_active (action);
 G_GNUC_END_IGNORE_DEPRECATIONS
 
-  terminal_window_size_push (window);
+  /* don't do anything if the menubar is already in the desired state (shown/hidden) */
+  if (gtk_widget_is_visible (window->priv->menubar) != show)
+    {
+      terminal_window_size_push (window);
 
-  if (show)
-    gtk_widget_show (window->priv->menubar);
-  else
-    gtk_widget_hide (window->priv->menubar);
+      if (show)
+        gtk_widget_show (window->priv->menubar);
+      else
+        gtk_widget_hide (window->priv->menubar);
 
-  terminal_window_size_pop (window);
+      terminal_window_size_pop (window);
+    }
 }
 
 
 
 /**
- * terminal_window_action_show_menubar:
+ * terminal_window_update_tab_key_accels:
  * @window          : A #TerminalWindow.
  * @tab_key_accels  : A list of Tab key accelerators.
  **/

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