hidpi: Restore scaling to initial cursor size, tile HUD threshold and

some tile/maximize break-away distances.
linuxmint · Apr 16, 2019 · c72054b · c72054b
1 parent b625cfb
commit c72054b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/display.c b/src/core/display.c
@@ -805,7 +805,7 @@ meta_display_open (void)
 #ifdef HAVE_XCURSOR
   {
     XcursorSetTheme (the_display->xdisplay, the_display->prefs->cursor_theme);
-    XcursorSetDefaultSize (the_display->xdisplay, (*the_display->prefs->cursor_size));
+    XcursorSetDefaultSize (the_display->xdisplay, (*the_display->prefs->cursor_size) * (*the_display->prefs->ui_scale));
   }
 #else /* HAVE_XCURSOR */
   meta_verbose ("Not compiled with Xcursor support\n");

diff --git a/src/core/window.c b/src/core/window.c
@@ -9400,7 +9400,7 @@ update_move (MetaWindow  *window,
                                                                      work_area,
                                                                      x,
                                                                      y,
-                                                                     *prefs->tile_hud_threshold);
+                                                                     (*prefs->tile_hud_threshold) * (*prefs->ui_scale));
 
       guint edge_zone = meta_window_get_current_zone (window,
                                                       monitor->rect,
@@ -9448,7 +9448,7 @@ update_move (MetaWindow  *window,
    * the threshold in the Y direction. Tiled windows can also be pulled
    * loose via X motion.
    */
-  breakloose_threshold = *prefs->resize_threshold * 2;
+  breakloose_threshold = (*prefs->resize_threshold) * 2 * (*prefs->ui_scale);
 
   if (window->tile_type == META_WINDOW_TILE_TYPE_SNAPPED)
     breakloose_threshold *= 2;
@@ -9633,7 +9633,7 @@ check_resize_unmaximize(MetaWindow *window,
   int threshold;
   MetaMaximizeFlags new_unmaximize;
 
-  threshold = *window->display->prefs->resize_threshold;
+  threshold = (*window->display->prefs->resize_threshold) * (*window->display->prefs->ui_scale);
   new_unmaximize = 0;
 
   if (window->maximized_horizontally ||