Merge lp:~unity-team/bamf/x-sru3 into lp:bamf/xenial

Proposed by Marco Trevisan (Treviño) on 2016-08-24
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-09-04
Approved revision: 639
Merged at revision: 639
Proposed branch: lp:~unity-team/bamf/x-sru3
Merge into: lp:bamf/xenial
Diff against target: 34 lines (+15/-1)
2 files modified
debian/changelog (+7/-0)
src/bamf-legacy-window.c (+8/-1)
To merge this branch: bzr merge lp:~unity-team/bamf/x-sru3
Reviewer Review Type Date Requested Status
Unity Team 2016-08-24 Pending
Review via email: mp+303809@code.launchpad.net

Commit message

Releasing SRU3 for Ubuntu 16.04

To post a comment you must log in.

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-07-01 10:44:07 +0000
3+++ debian/changelog 2016-08-24 12:58:09 +0000
4@@ -1,3 +1,10 @@
5+bamf (0.5.3~bzr0+16.04.20160701-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Unscale x/y coordinates returned by top_window_action_menu. (LP:
8+ #1606234)
9+
10+ -- Andrea Azzarone <azzaronea@gmail.com> Wed, 24 Aug 2016 14:45:36 +0200
11+
12 bamf (0.5.3~bzr0+16.04.20160701-0ubuntu1) xenial; urgency=medium
13
14 [ Marco Trevisan (Treviño) ]
15
16=== modified file 'src/bamf-legacy-window.c'
17--- src/bamf-legacy-window.c 2016-06-02 01:00:36 +0000
18+++ src/bamf-legacy-window.c 2016-08-24 12:58:09 +0000
19@@ -543,8 +543,15 @@
20 top_window_action_menu (GtkMenu *menu, gint *x, gint *y, gboolean *push, gpointer data)
21 {
22 BamfLegacyWindow *self = data;
23- gint w, h;
24+ gint w, h, scale;
25+
26+ scale = gdk_screen_get_monitor_scale_factor (gdk_screen_get_default (), 0);
27+ scale = !scale ? 1: scale;
28+
29 wnck_window_get_client_window_geometry (self->priv->legacy_window, x, y, &w, &h);
30+ *x /= scale;
31+ *y /= scale;
32+
33 *push = TRUE;
34 }
35

Subscribers

People subscribed via source and target branches

to all changes: