desktop-canvas-view: scale desktop workarea

azzar1 · lukefromdc · commit 35eb4160b389 · 2018-04-04T21:53:21.000-04:00
The problem is that in the function canvas_container_set_workarea the screen width and height are in "application pixels" while the workarea ones are in "device pixels" so when the scaling is > 1, the margins are not properly setted. We need to scale-down the workarea geometries to "application pixels". https://bugzilla.gnome.org/show_bug.cgi?id=769302 origin commit: https://gitlab.gnome.org/GNOME/nautilus/commit/315a55df
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
@@ -115,19 +115,23 @@ icon_container_set_workarea (CajaIconContainer *icon_container,
 {
     int left, right, top, bottom;
     int screen_width, screen_height;
+    int scale;
     int i;
 
     left = right = top = bottom = 0;
 
     screen_width  = WidthOfScreen (gdk_x11_screen_get_xscreen (screen));
     screen_height = HeightOfScreen (gdk_x11_screen_get_xscreen (screen));
 
+    scale = gdk_window_get_scale_factor (gdk_screen_get_root_window (screen));
+    scale = scale ? scale : 1;
+
     for (i = 0; i < n_items; i += 4)
     {
-        int x      = workareas [i];
-        int y      = workareas [i + 1];
-        int width  = workareas [i + 2];
-        int height = workareas [i + 3];
+        int x      = workareas [i] / scale;
+        int y      = workareas [i + 1] / scale;
+        int width  = workareas [i + 2] / scale;
+        int height = workareas [i + 3] / scale;
 
         if ((x + width) > screen_width || (y + height) > screen_height)
             continue;
