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

Proposed by William Hua
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 495
Merged at revision: 495
Proposed branch: lp:~attente/gtk/1434094
Merge into: lp:~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 61 lines (+41/-0)
3 files modified
debian/changelog (+8/-0)
debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch (+32/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~attente/gtk/1434094
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+285092@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-02-03 16:08:11 +0000
3+++ debian/changelog 2016-02-04 16:42:03 +0000
4@@ -1,3 +1,11 @@
5+gtk+3.0 (3.18.7-1ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch:
8+ + Take upstream patch to fix calculation of monitor work area when
9+ a non-unity scale factor is used (LP: #1434094)
10+
11+ -- William Hua <william.hua@canonical.com> Thu, 04 Feb 2016 11:10:21 -0500
12+
13 gtk+3.0 (3.18.7-1ubuntu1) xenial; urgency=medium
14
15 * New upstream version merged from Debian
16
17=== added file 'debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch'
18--- debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch 1970-01-01 00:00:00 +0000
19+++ debian/patches/git-x11-don-t-apply-scaling-factor-twice.patch 2016-02-04 16:42:03 +0000
20@@ -0,0 +1,32 @@
21+From fd6f15aad530f8244301fd43acbd23cde920f9b1 Mon Sep 17 00:00:00 2001
22+From: William Hua <william.hua@canonical.com>
23+Date: Tue, 2 Feb 2016 15:33:33 -0500
24+Subject: [PATCH] x11: don't apply scaling factor twice
25+
26+The fallback behaviour of get_work_area () divides the
27+screen width and height by the window scaling factor, but
28+those values are already scaled down.
29+
30+https://bugzilla.gnome.org/show_bug.cgi?id=761474
31+---
32+ gdk/x11/gdkscreen-x11.c | 4 ++--
33+ 1 file changed, 2 insertions(+), 2 deletions(-)
34+
35+diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
36+index 44bb69f..abd3cae 100644
37+--- a/gdk/x11/gdkscreen-x11.c
38++++ b/gdk/x11/gdkscreen-x11.c
39+@@ -328,8 +328,8 @@ get_work_area (GdkScreen *screen,
40+ /* Defaults in case of error */
41+ area->x = 0;
42+ area->y = 0;
43+- area->width = gdk_screen_get_width (screen) / x11_screen->window_scale;
44+- area->height = gdk_screen_get_height (screen) / x11_screen->window_scale;
45++ area->width = gdk_screen_get_width (screen);
46++ area->height = gdk_screen_get_height (screen);
47+
48+ if (!gdk_x11_screen_supports_net_wm_hint (screen,
49+ gdk_atom_intern_static_string ("_NET_WORKAREA")))
50+--
51+2.7.0
52+
53
54=== modified file 'debian/patches/series'
55--- debian/patches/series 2016-02-03 16:05:28 +0000
56+++ debian/patches/series 2016-02-04 16:42:03 +0000
57@@ -25,3 +25,4 @@
58 git-refresh-mir-backend.patch
59 0001-gtkwindow-set-transparent-background-color.patch
60 ubuntu_fileselector_behaviour.patch
61+git-x11-don-t-apply-scaling-factor-twice.patch

Subscribers

People subscribed via source and target branches

to all changes: