[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix vte "resize-window" signal handler

[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 483c4feb56b834f04a25ac63e1319b40d6c2c548
Author: Igor <f2404 at yandex.ru>
Date:   Mon Sep 19 12:53:26 2016 +0300

    Fix vte "resize-window" signal handler
    
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12859
---
 terminal/terminal-screen.c | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 9063f1f..1a30217 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1241,12 +1241,6 @@ terminal_screen_vte_resize_window (VteTerminal    *terminal,
                                    TerminalScreen *screen)
 {
   GtkWidget *toplevel;
-  gint       xpad;
-  gint       ypad;
-  glong      grid_width;
-  glong      grid_height;
-  glong      char_width;
-  glong      char_height;
 
   terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
   terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
@@ -1258,23 +1252,10 @@ terminal_screen_vte_resize_window (VteTerminal    *terminal,
           & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0)
     return;
 
-  terminal_screen_get_geometry (screen, &char_width, &char_height, &xpad, &ypad);
-
-  grid_width = (width - xpad) / char_width;
-  grid_height = (height - ypad) / char_height;
-
-  /* leave if there is nothing to resize */
-    if (vte_terminal_get_column_count (terminal) == grid_width
-        && vte_terminal_get_row_count (terminal) == grid_height)
-    return;
-
   /* set the terminal size and resize the window if it is active */
-  vte_terminal_set_size (terminal, grid_width, grid_height);
+  vte_terminal_set_size (terminal, width, height);
   if (screen == terminal_window_get_active (TERMINAL_WINDOW (toplevel)))
-    {
-      terminal_screen_force_resize_window (screen, GTK_WINDOW (toplevel),
-                                           grid_width, grid_height);
-    }
+    terminal_screen_force_resize_window (screen, GTK_WINDOW (toplevel), width, height);
 }
 
 

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