[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix the size of drop-down window after it's been in fullscreen mode

[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 2c0794e9670e7839309c17a7014496a822a0eae5
Author: Igor <f2404 at yandex.ru>
Date:   Sat Apr 20 17:58:22 2019 -0400

    Fix the size of drop-down window after it's been in fullscreen mode
    
    Fixes bug #15240
---
 terminal/terminal-window.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index 54bb4ef..4026ca9 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -702,7 +702,11 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (window->priv->action_fullscreen)) != fullscreen)
         gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (window->priv->action_fullscreen), fullscreen);
 G_GNUC_END_IGNORE_DEPRECATIONS
-    }
+
+      /* update drop-down window geometry, otherwise it'll be incorrect */
+      if (!fullscreen && window->priv->drop_down)
+        terminal_window_dropdown_update_geometry (TERMINAL_WINDOW_DROPDOWN (window));
+  }
 
   if (GTK_WIDGET_CLASS (terminal_window_parent_class)->window_state_event != NULL)
     return (*GTK_WIDGET_CLASS (terminal_window_parent_class)->window_state_event) (widget, event);
@@ -2032,13 +2036,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
       if (fullscreen)
         gtk_window_fullscreen (GTK_WINDOW (window));
       else
-        {
-          gtk_window_unfullscreen (GTK_WINDOW (window));
-
-          /* update drop-down window geometry, otherwise it'll be incorrect */
-          if (window->priv->drop_down)
-            terminal_window_dropdown_update_geometry (TERMINAL_WINDOW_DROPDOWN (window));
-        }
+        gtk_window_unfullscreen (GTK_WINDOW (window));
     }
 }
 

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