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

[Marco Trevisan (Treviño)]

Releasing SRU3 for Ubuntu 16.04

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-01 10:44:07 +0000
+++ debian/changelog	2016-08-24 12:58:09 +0000
@@ -1,3 +1,10 @@
+bamf (0.5.3~bzr0+16.04.20160701-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Unscale x/y coordinates returned by top_window_action_menu. (LP:
+    #1606234)
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 24 Aug 2016 14:45:36 +0200
+
 bamf (0.5.3~bzr0+16.04.20160701-0ubuntu1) xenial; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2016-06-02 01:00:36 +0000
+++ src/bamf-legacy-window.c	2016-08-24 12:58:09 +0000
@@ -543,8 +543,15 @@
 top_window_action_menu (GtkMenu *menu, gint *x, gint *y, gboolean *push, gpointer data)
 {
   BamfLegacyWindow *self = data;
-  gint w, h;
+  gint w, h, scale;
+
+  scale = gdk_screen_get_monitor_scale_factor (gdk_screen_get_default (), 0);
+  scale = !scale ? 1: scale;
+
   wnck_window_get_client_window_geometry (self->priv->legacy_window, x, y, &w, &h);
+  *x /= scale;
+  *y /= scale;
+
   *push = TRUE;
 }