Merge lp:~azzar1/bamf/fix-highdpi-actionmenu into lp:bamf

[Andrea Azzarone]

Unscale x/y coordinates returned by top_window_action_menu.

Using index_monitor 0 on X is just fine as we don't support per-monitor scaling factor.

[Marco Trevisan (Treviño) (3v1n0)]

Good one!

review: Approve

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2016-06-01 11:57:58 +0000
+++ src/bamf-legacy-window.c	2016-07-25 13:31:50 +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;
 }