[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix invalid geometry 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 7ea2cf560c5b79b53b84a1360e0a161dce60b661
Author: Igor <f2404 at yandex.ru>
Date:   Tue Sep 17 14:41:42 2019 -0400

    Fix invalid geometry on Wayland
    
    Also fixes the issue with increasing the window size when showing or hiding
    widgets such as tabbar, toolbar, menubar on Wayland.
---
 terminal/terminal-screen.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index e7d1055..f2ba041 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -2168,7 +2168,7 @@ terminal_screen_force_resize_window (TerminalScreen *screen,
                                      glong           rows)
 {
   GtkRequisition terminal_requisition;
-  GtkRequisition window_requisition;
+  GtkRequisition vbox_requisition;
   gint           width;
   gint           height;
   gint           xpad, ypad;
@@ -2181,7 +2181,7 @@ terminal_screen_force_resize_window (TerminalScreen *screen,
 
   terminal_screen_set_window_geometry_hints (screen, window);
 
-  gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &window_requisition);
+  gtk_widget_get_preferred_size (terminal_window_get_vbox (TERMINAL_WINDOW (window)), NULL, &vbox_requisition);
   gtk_widget_get_preferred_size (screen->terminal, NULL, &terminal_requisition);
 
   if (columns < 1)
@@ -2193,12 +2193,12 @@ terminal_screen_force_resize_window (TerminalScreen *screen,
                                 &char_width, &char_height,
                                 &xpad, &ypad);
 
-  width = window_requisition.width - terminal_requisition.width;
+  width = vbox_requisition.width - terminal_requisition.width;
   if (width < 0)
     width = 0;
   width += xpad + char_width * columns;
 
-  height = window_requisition.height - terminal_requisition.height;
+  height = vbox_requisition.height - terminal_requisition.height;
   if (height < 0)
     height = 0;
   height += ypad + char_height * rows;

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