Merge lp:~attente/gtk/1434094 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[William Hua]

Take upstream patch fixing the calculation of the monitor work area when a different window scaling factor is used.

Take upstream patch fixing the calculation of the monitor work area when a different window scaling factor is used.

[Sebastien Bacher (seb128)]

upstream said that they like it, why wouldn't we? ;-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-03 16:08:11 +0000
+++ debian/changelog	2016-02-04 16:42:03 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.18.7-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch:
+    + Take upstream patch to fix calculation of monitor work area when
+      a non-unity scale factor is used (LP: #1434094)
+
+ -- William Hua <[e-mail]>  Thu, 04 Feb 2016 11:10:21 -0500
+
 gtk+3.0 (3.18.7-1ubuntu1) xenial; urgency=medium
 
   * New upstream version merged from Debian
 
=== added file 'debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch'
--- debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch	2016-02-04 16:42:03 +0000
@@ -0,0 +1,32 @@
+From fd6f15aad530f8244301fd43acbd23cde920f9b1 Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Tue, 2 Feb 2016 15:33:33 -0500
+Subject: [PATCH] x11: don't apply scaling factor twice
+
+The fallback behaviour of get_work_area () divides the
+screen width and height by the window scaling factor, but
+those values are already scaled down.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761474
+---
+ gdk/x11/gdkscreen-x11.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
+index 44bb69f..abd3cae 100644
+--- a/gdk/x11/gdkscreen-x11.c
++++ b/gdk/x11/gdkscreen-x11.c
+@@ -328,8 +328,8 @@ get_work_area (GdkScreen    *screen,
+   /* Defaults in case of error */
+   area->x = 0;
+   area->y = 0;
+-  area->width = gdk_screen_get_width (screen) / x11_screen->window_scale;
+-  area->height = gdk_screen_get_height (screen) / x11_screen->window_scale;
++  area->width = gdk_screen_get_width (screen);
++  area->height = gdk_screen_get_height (screen);
+ 
+   if (!gdk_x11_screen_supports_net_wm_hint (screen,
+                                             gdk_atom_intern_static_string ("_NET_WORKAREA")))
+-- 
+2.7.0
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2016-02-03 16:05:28 +0000
+++ debian/patches/series	2016-02-04 16:42:03 +0000
@@ -25,3 +25,4 @@
 git-refresh-mir-backend.patch
 0001-gtkwindow-set-transparent-background-color.patch
 ubuntu_fileselector_behaviour.patch
+git-x11-don-t-apply-scaling-factor-twice.patch