Don't apply scale twice when using fractional scaling (#2664)

When using fractional scaling actor sizes, margins, monitor geometry, etc. are already in logical units, i.e. with the scale applied so manually multiplying with the scale again will result in it being applied twice.

In the future this will probably be the only mode (e.g. GNOME doesn't support per monitor scaling for its Shell UI without 'scale-monitor-framebuffer' because they argue it's not worth the effort given that it will be not needed in the future: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/1864) which will then let us remove all our custom scale handling but until then this introduces no regressions while improving the behavior for fractional scale enabled.

Fixes #2412

Co-authored-by: Leo <[email protected]>

Author: leolost2605

lib/Utils.vala

@@ -293,7 +293,7 @@ namespace Gala {
          *
          * @param workspace The workspace on which to count the windows
          * @param exclude a window to not count
-         * 
+         *
          */
         public static uint get_n_windows (Meta.Workspace workspace, bool on_primary = false, Meta.Window? exclude = null) {
             var n = 0;
@@ -350,16 +350,6 @@ namespace Gala {
             return container;
         }
 
-        /**
-         * DEPRECATED: When used with Mutter 44, this will always return 1.
-         * Get the scaling factor for the monitor you are drawing to with
-         * `Meta.Display.get_monitor_scale` instead
-         */
-        [Version (deprecated = true, deprecated_since = "7.0.3", replacement = "Meta.Display.get_monitor_scale")]
-        public static int get_ui_scaling_factor () {
-            return 1;
-        }
-
         /**
          * Returns the pixbuf that is used for resize buttons throughout gala at a
          * size of 36px
@@ -505,5 +495,13 @@ namespace Gala {
 
             return framebuffer_is_logical;
         }
+
+        public static float get_ui_scaling_factor (Meta.Display display, int monitor_index) {
+            if (get_framebuffer_is_logical ()) {
+                return 1.0f;
+            } else {
+                return display.get_monitor_scale (monitor_index);
+            }
+        }
     }
 }

src/Background/BackgroundManager.vala

@@ -99,7 +99,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
                 };
 
                 new_content.set_rounded_clip_bounds (clip_bounds);
-                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, Utils.get_ui_scaling_factor (display, monitor_index));
             }
 
             swap_background_actor (animate);
@@ -119,7 +119,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
                 };
 
                 new_content.set_rounded_clip_bounds (clip_bounds);
-                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, Utils.get_ui_scaling_factor (display, monitor_index));
             }
 
             swap_background_actor (animate);

src/BlurManager.vala

@@ -74,7 +74,7 @@ public class Gala.BlurManager : Object {
         var x_shadow_size = frame_rect.x - buffer_rect.x;
         var y_shadow_size = frame_rect.y - buffer_rect.y;
 
-        var monitor_scale = Utils.get_framebuffer_is_logical () ? 1.0f : window.display.get_monitor_scale (window.get_monitor ());
+        var monitor_scale = Utils.get_ui_scaling_factor (window.display, window.get_monitor ());
         var inverse_monitor_scale = 1.0f / monitor_scale;
 
         blur_data.actor.set_position (

src/DesktopIntegration.vala

@@ -220,7 +220,7 @@ public class Gala.DesktopIntegration : GLib.Object {
         transition.set_to_value (0);
         transition.set_key_frames ( { 0.5, -0.5 } );
 
-        var offset = Utils.scale_to_int (15, display.get_monitor_scale (window.get_monitor ()));
+        var offset = Utils.scale_to_int (15, Utils.get_ui_scaling_factor (display, window.get_monitor ()));
         transition.set_values ( { -offset, offset });
 
         transition.stopped.connect (() => {

src/HotCorners/HotCornerManager.vala

@@ -42,7 +42,7 @@ public class Gala.HotCornerManager : Object {
 
         var primary = display.get_primary_monitor ();
         var geometry = display.get_monitor_geometry (primary);
-        var scale = display.get_monitor_scale (primary);
+        var scale = Utils.get_ui_scaling_factor (display, primary);
 
         remove_all_hot_corners ();
         add_hotcorner (geometry.x, geometry.y, scale, HotCorner.POSITION_TOP_LEFT);

src/NotificationStack.vala

@@ -95,7 +95,7 @@ public class Gala.NotificationStack : Object {
 
         var primary = display.get_primary_monitor ();
         var area = display.get_workspace_manager ().get_active_workspace ().get_work_area_for_monitor (primary);
-        var scale = display.get_monitor_scale (primary);
+        var scale = Utils.get_ui_scaling_factor (display, primary);
 
         int notification_x_pos = area.x + area.width - window_rect.width;
         if (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL) {
@@ -110,7 +110,7 @@ public class Gala.NotificationStack : Object {
         var primary = display.get_primary_monitor ();
         var area = display.get_workspace_manager ().get_active_workspace ().get_work_area_for_monitor (primary);
 
-        var scale = display.get_monitor_scale (primary);
+        var scale = Utils.get_ui_scaling_factor (display, primary);
         stack_width = Utils.scale_to_int (WIDTH + MARGIN, scale);
 
         stack_y = area.y;
@@ -119,7 +119,7 @@ public class Gala.NotificationStack : Object {
     }
 
     private void update_positions (float add_y = 0.0f) {
-        var scale = display.get_monitor_scale (display.get_primary_monitor ());
+        var scale = Utils.get_ui_scaling_factor (display, display.get_primary_monitor ());
 
         var y = stack_y + TOP_OFFSET + add_y + Utils.scale_to_int (ADDITIONAL_MARGIN, scale);
         var i = notifications.size;

src/ShellClients/HideTracker.vala

@@ -160,7 +160,7 @@ public class Gala.HideTracker : Object {
 
     private void setup_barrier () {
         var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
-        var scale = display.get_monitor_scale (display.get_primary_monitor ());
+        var scale = Utils.get_ui_scaling_factor (display, display.get_primary_monitor ());
         var offset = Utils.scale_to_int (BARRIER_OFFSET, scale);
 
         switch (panel.anchor) {

src/Widgets/DwellClickTimer.vala

@@ -62,7 +62,7 @@ public class Gala.DwellClickTimer : Clutter.Actor, Clutter.Animatable {
         seat.set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType.PRIMARY);
 
         seat.ptr_a11y_timeout_started.connect ((device, type, timeout) => {
-            var scale = display.get_monitor_scale (display.get_current_monitor ());
+            var scale = Utils.get_ui_scaling_factor (display, display.get_current_monitor ());
             update_cursor_size (scale);
 
 #if HAS_MUTTER48

src/Widgets/MultitaskingView/MonitorClone.vala

@@ -58,6 +58,6 @@ public class Gala.MonitorClone : ActorTarget {
         set_position (monitor_geometry.x, monitor_geometry.y);
         set_size (monitor_geometry.width, monitor_geometry.height);
 
-        monitor_scale = display.get_monitor_scale (monitor);
+        monitor_scale = Utils.get_ui_scaling_factor (display, monitor);
     }
 }

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -78,7 +78,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         add_gesture_controller (workspaces_gesture_controller);
 
 #if OLD_ICON_GROUPS
-        icon_groups = new IconGroupContainer (display.get_monitor_scale (display.get_primary_monitor ()));
+        icon_groups = new IconGroupContainer (Utils.get_ui_scaling_factor (display, display.get_primary_monitor ()));
 #endif
 
         update_blurred_bg ();
@@ -151,7 +151,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         }
 
         var primary_geometry = display.get_monitor_geometry (primary);
-        var scale = display.get_monitor_scale (primary);
+        var scale = Utils.get_ui_scaling_factor (display, primary);
 #if OLD_ICON_GROUPS
         icon_groups.scale_factor = scale;
 #endif
@@ -272,7 +272,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
             modal_proxy.allow_actions ({ MULTITASKING_VIEW, SWITCH_WORKSPACE, ZOOM });
 
 #if OLD_ICON_GROUPS
-            var scale = display.get_monitor_scale (display.get_primary_monitor ());
+            var scale = Utils.get_ui_scaling_factor (display, display.get_primary_monitor ());
             icon_groups.force_reposition ();
             icon_groups.y = primary_monitor_container.height - Utils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET - 20, scale);
             reposition_icon_groups (false);
@@ -363,7 +363,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
             icon_groups.set_easing_duration (200);
         }
 
-        var scale = display.get_monitor_scale (display.get_primary_monitor ());
+        var scale = Utils.get_ui_scaling_factor (display, display.get_primary_monitor ());
         // make sure the active workspace's icongroup is always visible
         var icon_groups_width = icon_groups.calculate_total_width ();
         if (icon_groups_width > primary_monitor_container.width) {
@@ -380,7 +380,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
 
     private void add_workspace (int num) {
         unowned var manager = display.get_workspace_manager ();
-        var scale = display.get_monitor_scale (display.get_primary_monitor ());
+        var scale = Utils.get_ui_scaling_factor (display, display.get_primary_monitor ());
 
         var workspace = new WorkspaceClone (wm, manager.get_workspace_by_index (num), scale);
         workspaces.insert_child_at_index (workspace, num);