[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix geometry setting for GTK 3.20.5

[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 3af6615150b1b7fbc97a28b887cfb6a847ffb46c
Author: Igor <f2404 at yandex.ru>
Date:   Tue Sep 6 17:12:06 2016 +0300

    Fix geometry setting for GTK 3.20.5
    
    Geometry settings (default or provided via the command line option) were
    overridden under GTK 3.20.5. The solution is to store them in the window
    object when applying.
    
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12810
---
 terminal/terminal-app.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 85b8af3..233fc3c 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -813,8 +813,14 @@ terminal_app_open_window (TerminalApp        *app,
             {
               active_terminal = terminal_window_get_active (TERMINAL_WINDOW (window));
               if (G_LIKELY (active_terminal != NULL))
-                terminal_screen_force_resize_window (active_terminal, GTK_WINDOW (window),
-                                                     width, height);
+                {
+                  /* save window geometry to prevent overriding */
+                  TERMINAL_WINDOW (window)->grid_height = height;
+                  TERMINAL_WINDOW (window)->grid_width = width;
+
+                  terminal_screen_force_resize_window (active_terminal, GTK_WINDOW (window),
+                                                       width, height);
+                }
             }
           if ((mask & XValue) && (mask & YValue))
             {

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