From b1898d7874377dd76f7321e9b3601bdd93fde00b Mon Sep 17 00:00:00 2001

From: Victor Kareh <vkareh@vkareh.net>

Date: Tue, 24 Apr 2018 15:09:08 -0400

Subject: [PATCH] Correct resize popup position on HiDPI displays

---

 src/core/window.c    | 7 +++++--

 src/ui/resizepopup.c | 8 ++++++++

 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/core/window.c b/src/core/window.c

index abd5af4..44084a0 100644

--- a/src/core/window.c

+++ b/src/core/window.c

@@ -8073,8 +8073,11 @@ meta_window_refresh_resize_popup (MetaWindow *window)

   if (window->display->grab_resize_popup == NULL)

     {

-      if (window->size_hints.width_inc > 1 ||

-          window->size_hints.height_inc > 1)

+      gint scale = gdk_window_get_scale_factor (gdk_get_default_root_window ());

+      /* Display the resize popup only for windows that report an

+       * increment hint that's larger than the scale factor. */

+      if (window->size_hints.width_inc > scale ||

+          window->size_hints.height_inc > scale)

         window->display->grab_resize_popup =

           meta_ui_resize_popup_new (window->display->xdisplay,

                                     window->screen->number);

diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c

index c60fcd6..0464636 100644

--- a/src/ui/resizepopup.c

+++ b/src/ui/resizepopup.c

@@ -106,9 +106,11 @@ update_size_window (MetaResizePopup *popup)

   char *str;

   int x, y;

   int width, height;

+  int scale;

   g_return_if_fail (popup->size_window != NULL);

+  scale = gtk_widget_get_scale_factor (GTK_WIDGET (popup->size_window));

   /* Translators: This represents the size of a window.  The first number is

    * the width of the window and the second is the height.

    */

@@ -125,6 +127,12 @@ update_size_window (MetaResizePopup *popup)

   x = popup->rect.x + (popup->rect.width - width) / 2;

   y = popup->rect.y + (popup->rect.height - height) / 2;

+  if (scale)

+    {

+      x = x / scale;

+      y = y / scale;

+    }

+

   if (gtk_widget_get_realized (popup->size_window))

     {

       /* using move_resize to avoid jumpiness */

-- 

2.13.6