r47894 - in /desktop/experimental/gnome-terminal/debian: changelog patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Apr 12 20:56:38 2016
New Revision: 47894

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47894
Log:
Update patch for #819712 to make the window fill the screen
properly when maximized, and when snapped to left/right half of
screen in GNOME Shell (the latter doesn't work in Wayland yet)

Modified:
    desktop/experimental/gnome-terminal/debian/changelog
    desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch

Modified: desktop/experimental/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/changelog?rev=47894&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/changelog	[utf-8] Tue Apr 12 20:56:38 2016
@@ -2,6 +2,9 @@
 
   * New upstream release
     - updated translations
+  * Update patch for #819712 to make the window fill the screen
+    properly when maximized, and when snapped to left/right half of
+    screen in GNOME Shell (the latter doesn't work in Wayland yet)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 12 Apr 2016 21:51:44 +0100
 

Modified: desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch?rev=47894&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch	[utf-8] Tue Apr 12 20:56:38 2016
@@ -1,5 +1,5 @@
 From: Simon McVittie <smcv at debian.org>
-Date: Mon, 4 Apr 2016 09:09:13 +0100
+Date: Mon, 4 Apr 2016 11:10:38 +0100
 Subject: Replace no-op gtk_window_resize_to_geometry by calculating new size
 
 Together with the previous commit, this fixes a regression in
@@ -9,11 +9,11 @@
 Signed-off-by: Simon McVittie <smcv at debian.org>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=760944
 ---
- src/terminal-window.c | 136 +++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 102 insertions(+), 34 deletions(-)
+ src/terminal-window.c | 148 ++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 114 insertions(+), 34 deletions(-)
 
 diff --git a/src/terminal-window.c b/src/terminal-window.c
-index ccfceaa..a306ff6 100644
+index ccfceaa..adef2b3 100644
 --- a/src/terminal-window.c
 +++ b/src/terminal-window.c
 @@ -72,11 +72,26 @@ struct _TerminalWindowPrivate
@@ -111,12 +111,24 @@
  		      priv->menubar,
  		      FALSE, FALSE, 0);
  
-@@ -3200,13 +3223,29 @@ terminal_window_update_size (TerminalWindow *window)
+@@ -3200,13 +3223,41 @@ terminal_window_update_size (TerminalWindow *window)
  {
    TerminalWindowPrivate *priv = window->priv;
    int grid_width, grid_height;
 +  int pixel_width, pixel_height;
-+
++  GdkWindow *gdk_window;
++
++  gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
++
++  if (gdk_window != NULL &&
++      (gdk_window_get_state (gdk_window) &
++       (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_TILED)))
++    {
++      /* Don't adjust the size of maximized or tiled (snapped, half-maximized)
++       * windows: if we do, there will be ugly gaps of up to 1 character cell
++       * around otherwise tiled windows. */
++      return;
++    }
  
    /* be sure our geometry is up-to-date */
    terminal_window_update_geometry (window);
@@ -142,7 +154,7 @@
  }
  
  void
-@@ -3560,12 +3599,13 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3560,12 +3611,13 @@ terminal_window_update_geometry (TerminalWindow *window)
  {
    TerminalWindowPrivate *priv = window->priv;
    GtkWidget *widget;
@@ -160,7 +172,7 @@
    if (priv->active_screen == NULL)
      return;
  
-@@ -3577,25 +3617,48 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3577,25 +3629,48 @@ terminal_window_update_geometry (TerminalWindow *window)
     * window, but that doesn't make too much sense.
     */
    terminal_screen_get_cell_size (priv->active_screen, &char_width, &char_height);
@@ -225,7 +237,7 @@
  
  #define MIN_WIDTH_CHARS 4
  #define MIN_HEIGHT_CHARS 1
-@@ -3623,11 +3686,9 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3623,11 +3698,9 @@ terminal_window_update_geometry (TerminalWindow *window)
                               hints.min_height,
                               hints.width_inc,
                               hints.height_inc);
@@ -240,7 +252,7 @@
        priv->old_geometry_widget = widget;
      }
    else
-@@ -3636,6 +3697,13 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3636,6 +3709,13 @@ terminal_window_update_geometry (TerminalWindow *window)
                               "[window %p] hints: increment unchanged, not setting\n",
                               window);
      }