r54558 - in /desktop/unstable/gnome-terminal/debian: changelog patches/series patches/window-Fix-tiled-check.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Mon Oct 23 20:01:00 2017
New Revision: 54558

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54558
Log:
d/p/window-Fix-tiled-check.patch: Use non-character-cell-based
sizing whenever at least one edge is tiled, partially addressing
a regression with GTK+ >= 3.22.23 (partial fix for: #879566)

Added:
    desktop/unstable/gnome-terminal/debian/patches/window-Fix-tiled-check.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/patches/series

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=54558&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Mon Oct 23 20:01:00 2017
@@ -4,6 +4,9 @@
     Run gnome-terminal -- EXECUTABLE [ARGS] instead of deprecated
     gnome-terminal -e QUOTED_STRING or gnome-terminal -x EXECUTABLE [ARGS],
     and emulate xterm's fallback-to-shell behaviour more precisely.
+  * d/p/window-Fix-tiled-check.patch: Use non-character-cell-based
+    sizing whenever at least one edge is tiled, partially addressing
+    a regression with GTK+ >= 3.22.23 (partial fix for: #879566)
 
  -- Simon McVittie <smcv at debian.org>  Fri, 06 Oct 2017 14:03:15 +0100
 

Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=54558&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] Mon Oct 23 20:01:00 2017
@@ -3,3 +3,4 @@
 10_kfreebsd-f_dupfd_cloexec.patch
 Don-t-allow-the-theme-to-set-black-on-black.patch
 Provide-fallback-for-reading-current-directory-if-OS.patch
+window-Fix-tiled-check.patch

Added: desktop/unstable/gnome-terminal/debian/patches/window-Fix-tiled-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/window-Fix-tiled-check.patch?rev=54558&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/window-Fix-tiled-check.patch	(added)
+++ desktop/unstable/gnome-terminal/debian/patches/window-Fix-tiled-check.patch	[utf-8] Mon Oct 23 20:01:00 2017
@@ -0,0 +1,58 @@
+From: Christian Persch <chpe at src.gnome.org>
+Date: Mon, 23 Oct 2017 18:44:19 +0200
+Subject: window: Fix tiled check
+
+Add new tiled window states to the check.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=789356
+Origin: upstream, 3.27.0, commit:2f33a3630f7093fc4370f2a48437c3d2cd11a961
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879566
+---
+ src/terminal-window.c | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 2719708e..11dd78bb 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -146,6 +146,17 @@ struct _TerminalWindowPrivate
+ #endif
+ #endif
+ 
++/* See bug #789356 */
++#if GTK_CHECK_VERSION (3, 22, 23)
++#define WINDOW_STATE_TILED (GDK_WINDOW_STATE_TILED       | \
++                            GDK_WINDOW_STATE_LEFT_TILED  | \
++                            GDK_WINDOW_STATE_RIGHT_TILED | \
++                            GDK_WINDOW_STATE_TOP_TILED   | \
++                            GDK_WINDOW_STATE_BOTTOM_TILED)
++#else
++#define WINDOW_STATE_TILED (GDK_WINDOW_STATE_TILED)
++#endif
++
+ static void terminal_window_dispose     (GObject             *object);
+ static void terminal_window_finalize    (GObject             *object);
+ static gboolean terminal_window_state_event (GtkWidget            *widget,
+@@ -1886,7 +1897,9 @@ screen_resize_window_cb (TerminalScreen *screen,
+   GtkWidget *widget = GTK_WIDGET (screen);
+ 
+   if (gtk_widget_get_realized (widget) &&
+-      (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) != 0)
++      (gdk_window_get_state (gtk_widget_get_window (widget)) & (GDK_WINDOW_STATE_MAXIMIZED |
++                                                                GDK_WINDOW_STATE_FULLSCREEN |
++                                                                WINDOW_STATE_TILED)) != 0)
+     return;
+ 
+   vte_terminal_set_size (VTE_TERMINAL (priv->active_screen), columns, rows);
+@@ -3325,7 +3338,7 @@ terminal_window_update_size (TerminalWindow *window)
+ 
+   if (gdk_window != NULL &&
+       (gdk_window_get_state (gdk_window) &
+-       (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_TILED)))
++       (GDK_WINDOW_STATE_MAXIMIZED | 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
+-- 
+2.15.0.rc1
+