Scale screen dimensions

3 files changed, 30 insertions, 11 deletions

diff --git a/eel/eel-background.c b/eel/eel-background.c
index e9b4b2cf..02b4d857 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -308,8 +308,9 @@ drawable_get_adjusted_size (EelBackground *self,
     if (self->details->is_desktop)
     {
         GdkScreen *screen = gtk_widget_get_screen (self->details->widget);
-        *width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
-        *height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
+        gint scale = gtk_widget_get_scale_factor (self->details->widget);
+        *width = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
+        *height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
     }
     else
     {
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index 8fcda95f..da43cb0e 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -1049,6 +1049,7 @@ eel_editable_label_ensure_layout (EelEditableLabel *label,
             else
             {
                 gint wrap_width;
+                gint scale;
 
                 pango_layout_set_width (label->layout, -1);
                 pango_layout_get_extents (label->layout, NULL, &logical_rect);
@@ -1059,9 +1060,10 @@ eel_editable_label_ensure_layout (EelEditableLabel *label,
                 longest_paragraph = width;
 
                 wrap_width = get_label_wrap_width (label);
+                scale = gtk_widget_get_scale_factor (widget);
                 width = MIN (width, wrap_width);
                 width = MIN (width,
-                             PANGO_SCALE * (WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) + 1) / 2);
+                             PANGO_SCALE * (WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) / scale + 1) / 2);
 
                 pango_layout_set_width (label->layout, width);
                 pango_layout_get_extents (label->layout, NULL, &logical_rect);
@@ -3046,6 +3048,7 @@ popup_position_func (GtkMenu   *menu,
     GtkWidget *widget;
     GtkRequisition req;
     GtkAllocation allocation;
+    gint scale;
 
     label = EEL_EDITABLE_LABEL (user_data);
     widget = GTK_WIDGET (label);
@@ -3056,12 +3059,13 @@ popup_position_func (GtkMenu   *menu,
 
     gtk_widget_get_preferred_size (widget, &req, NULL);
     gtk_widget_get_allocation (widget, &allocation);
+    scale = gtk_widget_get_scale_factor (widget);
 
     *x += allocation.width / 2;
     *y += allocation.height;
 
-    *x = CLAMP (*x, 0, MAX (0, WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - req.width));
-    *y = CLAMP (*y, 0, MAX (0, HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - req.height));
+    *x = CLAMP (*x, 0, MAX (0, WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) / scale - req.width));
+    *y = CLAMP (*y, 0, MAX (0, HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) / scale - req.height));
 }
 
 static void
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index 21366fb4..ede45cfe 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -86,16 +86,22 @@ eel_gtk_window_get_geometry_string (GtkWindow *window)
 static void
 sanity_check_window_position (int *left, int *top)
 {
+    GdkScreen *screen;
+    gint scale;
+
     g_assert (left != NULL);
     g_assert (top != NULL);
 
+    screen = gdk_screen_get_default ();
+    scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
+
     /* Make sure the top of the window is on screen, for
      * draggability (might not be necessary with all window managers,
      * but seems reasonable anyway). Make sure the top of the window
      * isn't off the bottom of the screen, or so close to the bottom
      * that it might be obscured by the panel.
      */
-    *top = CLAMP (*top, 0, HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - MINIMUM_ON_SCREEN_HEIGHT);
+    *top = CLAMP (*top, 0, HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale - MINIMUM_ON_SCREEN_HEIGHT);
 
     /* FIXME bugzilla.eazel.com 669:
      * If window has negative left coordinate, set_uposition sends it
@@ -108,22 +114,28 @@ sanity_check_window_position (int *left, int *top)
      * the screen, or so close to the right edge that it might be
      * obscured by the panel.
      */
-    *left = CLAMP (*left, 0, WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())) - MINIMUM_ON_SCREEN_WIDTH);
+    *left = CLAMP (*left, 0, WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale - MINIMUM_ON_SCREEN_WIDTH);
 }
 
 static void
 sanity_check_window_dimensions (guint *width, guint *height)
 {
+    GdkScreen *screen;
+    gint scale;
+
     g_assert (width != NULL);
     g_assert (height != NULL);
 
+    screen = gdk_screen_get_default ();
+    scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
+
     /* Pin the size of the window to the screen, so we don't end up in
      * a state where the window is so big essential parts of it can't
      * be reached (might not be necessary with all window managers,
      * but seems reasonable anyway).
      */
-    *width = MIN (*width, WidthOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())));
-    *height = MIN (*height, HeightOfScreen (gdk_x11_screen_get_xscreen (gdk_screen_get_default ())));
+    *width = MIN (*width, WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale);
+    *height = MIN (*height, HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale);
 }
 
 /**
@@ -153,6 +165,7 @@ eel_gtk_window_set_initial_geometry (GtkWindow *window,
     GdkScreen *screen;
     int real_left, real_top;
     int screen_width, screen_height;
+    int scale;
 
     g_return_if_fail (GTK_IS_WINDOW (window));
 
@@ -168,8 +181,9 @@ eel_gtk_window_set_initial_geometry (GtkWindow *window,
         real_top = top;
 
         screen = gtk_window_get_screen (window);
-        screen_width  = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
-        screen_height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
+        scale = gtk_widget_get_scale_factor (GTK_WIDGET (window));
+        screen_width  = WidthOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
+        screen_height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen)) / scale;
 
         /* This is sub-optimal. GDK doesn't allow us to set win_gravity
          * to South/East types, which should be done if using negative