diff --git a/lib/Utils.vala b/lib/Utils.vala index 57a719bb6..1ce8ebfde 100644 --- a/lib/Utils.vala +++ b/lib/Utils.vala @@ -260,7 +260,7 @@ namespace Gala { * Multiplies an integer by a floating scaling factor, and then * returns the result rounded to the nearest integer */ - public static int scale_to_int (int value, float scale_factor) { + public static int scale_to_int (int value, float scale_factor) { return (int) (Math.round ((float)value * scale_factor)); } diff --git a/src/DesktopIntegration.vala b/src/DesktopIntegration.vala index 40611552e..ea835888a 100644 --- a/src/DesktopIntegration.vala +++ b/src/DesktopIntegration.vala @@ -210,7 +210,7 @@ public class Gala.DesktopIntegration : GLib.Object { transition.set_to_value (0); transition.set_key_frames ( { 0.5, -0.5 } ); - var offset = InternalUtils.scale_to_int (15, wm.get_display ().get_monitor_scale (window.get_monitor ())); + var offset = Utils.scale_to_int (15, wm.get_display ().get_monitor_scale (window.get_monitor ())); transition.set_values ( { -offset, offset }); transition.stopped.connect (() => { diff --git a/src/HotCorners/HotCorner.vala b/src/HotCorners/HotCorner.vala index f2193d22a..fe1e15ed3 100644 --- a/src/HotCorners/HotCorner.vala +++ b/src/HotCorners/HotCorner.vala @@ -101,7 +101,7 @@ public class Gala.HotCorner : Object { } private static Mtk.Rectangle get_barrier_rect (float x, float y, float scale, string hot_corner_position, Clutter.Orientation orientation) { - var barrier_size = InternalUtils.scale_to_int (BARRIER_SIZE, scale); + var barrier_size = Utils.scale_to_int (BARRIER_SIZE, scale); int x1 = (int) x; int y1 = (int) y; diff --git a/src/InternalUtils.vala b/src/InternalUtils.vala index d9f18da9a..5f69677f3 100644 --- a/src/InternalUtils.vala +++ b/src/InternalUtils.vala @@ -271,14 +271,6 @@ namespace Gala { } } - /** - * Multiplies an integer by a floating scaling factor, and then - * returns the result rounded to the nearest integer - */ - public static int scale_to_int (int value, float scale_factor) { - return (int) (Math.round ((float)value * scale_factor)); - } - /** * Returns the workspaces geometry following the only_on_primary settings. */ diff --git a/src/NotificationStack.vala b/src/NotificationStack.vala index 16be9b51b..64179bff2 100644 --- a/src/NotificationStack.vala +++ b/src/NotificationStack.vala @@ -103,7 +103,7 @@ public class Gala.NotificationStack : Object { notification_x_pos = 0; } - move_window (notification, notification_x_pos, stack_y + TOP_OFFSET + InternalUtils.scale_to_int (ADDITIONAL_MARGIN, scale)); + move_window (notification, notification_x_pos, stack_y + TOP_OFFSET + Utils.scale_to_int (ADDITIONAL_MARGIN, scale)); notifications.insert (0, notification); } @@ -112,13 +112,13 @@ public class Gala.NotificationStack : Object { var area = display.get_workspace_manager ().get_active_workspace ().get_work_area_for_monitor (primary); var scale = display.get_monitor_scale (primary); - stack_width = InternalUtils.scale_to_int (WIDTH + MARGIN, scale); + stack_width = Utils.scale_to_int (WIDTH + MARGIN, scale); stack_y = area.y; } private void update_positions (float scale, float add_y = 0.0f) { - var y = stack_y + TOP_OFFSET + add_y + InternalUtils.scale_to_int (ADDITIONAL_MARGIN, scale); + var y = stack_y + TOP_OFFSET + add_y + Utils.scale_to_int (ADDITIONAL_MARGIN, scale); var i = notifications.size; var delay_step = i > 0 ? 150 / i : 0; var iterator = 0; diff --git a/src/ShellClients/HideTracker.vala b/src/ShellClients/HideTracker.vala index b218e7130..8aeb7bcfe 100644 --- a/src/ShellClients/HideTracker.vala +++ b/src/ShellClients/HideTracker.vala @@ -271,7 +271,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 offset = InternalUtils.scale_to_int (BARRIER_OFFSET, scale); + var offset = Utils.scale_to_int (BARRIER_OFFSET, scale); switch (panel.anchor) { case TOP: diff --git a/src/Widgets/DwellClickTimer.vala b/src/Widgets/DwellClickTimer.vala index a2e9ac4a0..0abfa8e94 100644 --- a/src/Widgets/DwellClickTimer.vala +++ b/src/Widgets/DwellClickTimer.vala @@ -108,7 +108,7 @@ public class Gala.DwellClickTimer : Clutter.Actor, Clutter.Animatable { var radius = int.min (cursor_size / 2, cursor_size / 2); var end_angle = START_ANGLE + angle; - var border_width = InternalUtils.scale_to_int (BORDER_WIDTH_PX, scaling_factor); + var border_width = Utils.scale_to_int (BORDER_WIDTH_PX, scaling_factor); var cr = new Cairo.Context (surface); diff --git a/src/Widgets/MultitaskingView/IconGroup.vala b/src/Widgets/MultitaskingView/IconGroup.vala index 23bc251ba..0576f14ce 100644 --- a/src/Widgets/MultitaskingView/IconGroup.vala +++ b/src/Widgets/MultitaskingView/IconGroup.vala @@ -92,7 +92,7 @@ public class Gala.IconGroup : CanvasActor { } private void resize () { - var size = InternalUtils.scale_to_int (SIZE, scale_factor); + var size = Utils.scale_to_int (SIZE, scale_factor); width = size; height = size; @@ -107,10 +107,10 @@ public class Gala.IconGroup : CanvasActor { return; } - var width = InternalUtils.scale_to_int (100, scale_factor); - var x = (InternalUtils.scale_to_int (SIZE, scale_factor) - width) / 2; + var width = Utils.scale_to_int (100, scale_factor); + var x = (Utils.scale_to_int (SIZE, scale_factor) - width) / 2; var y = -10; - var height = InternalUtils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET, scale_factor); + var height = Utils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET, scale_factor); var backdrop_opacity_int = (uint8) (BACKDROP_ABSOLUTE_OPACITY * backdrop_opacity); #if HAS_MUTTER47 @@ -232,11 +232,11 @@ public class Gala.IconGroup : CanvasActor { 0, width, height, - InternalUtils.scale_to_int (5, scale_factor) + Utils.scale_to_int (5, scale_factor) ); var shadow_effect = new ShadowEffect ("", scale_factor) { - border_radius = InternalUtils.scale_to_int (5, scale_factor) + border_radius = Utils.scale_to_int (5, scale_factor) }; var style_manager = Drawing.StyleManager.get_instance (); @@ -278,7 +278,7 @@ public class Gala.IconGroup : CanvasActor { } } - var scaled_size = InternalUtils.scale_to_int (SIZE, scale_factor); + var scaled_size = Utils.scale_to_int (SIZE, scale_factor); if (n_windows < 1) { if (workspace_index != manager.get_n_workspaces () - 1) { @@ -286,19 +286,19 @@ public class Gala.IconGroup : CanvasActor { } var buffer = new Drawing.BufferSurface (scaled_size, scaled_size); - var offset = scaled_size / 2 - InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) / 2; + var offset = scaled_size / 2 - Utils.scale_to_int (PLUS_WIDTH, scale_factor) / 2; buffer.context.rectangle ( - InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset, + Utils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - Utils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset, offset, - InternalUtils.scale_to_int (PLUS_SIZE, scale_factor), - InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor) + Utils.scale_to_int (PLUS_SIZE, scale_factor), + Utils.scale_to_int (PLUS_WIDTH, scale_factor) ); buffer.context.rectangle (offset, - InternalUtils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - InternalUtils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset, - InternalUtils.scale_to_int (PLUS_WIDTH, scale_factor), - InternalUtils.scale_to_int (PLUS_SIZE, scale_factor) + Utils.scale_to_int (PLUS_WIDTH / 2, scale_factor) - Utils.scale_to_int (PLUS_SIZE / 2, scale_factor) + offset, + Utils.scale_to_int (PLUS_WIDTH, scale_factor), + Utils.scale_to_int (PLUS_SIZE, scale_factor) ); if (style_manager.prefers_color_scheme == DARK) { @@ -337,10 +337,10 @@ public class Gala.IconGroup : CanvasActor { var columns = (int) Math.ceil (Math.sqrt (n_tiled_windows)); var rows = (int) Math.ceil (n_tiled_windows / (double) columns); - int spacing = InternalUtils.scale_to_int (6, scale_factor); + int spacing = Utils.scale_to_int (6, scale_factor); - var width = columns * InternalUtils.scale_to_int (size, scale_factor) + (columns - 1) * spacing; - var height = rows * InternalUtils.scale_to_int (size, scale_factor) + (rows - 1) * spacing; + var width = columns * Utils.scale_to_int (size, scale_factor) + (columns - 1) * spacing; + var height = rows * Utils.scale_to_int (size, scale_factor) + (rows - 1) * spacing; var x_offset = scaled_size / 2 - width / 2; var y_offset = scaled_size / 2 - height / 2; @@ -359,10 +359,10 @@ public class Gala.IconGroup : CanvasActor { // draw an ellipsis at the 9th position if we need one if (show_ellipsis && i == 8) { - int top_offset = InternalUtils.scale_to_int (10, scale_factor); - int left_offset = InternalUtils.scale_to_int (2, scale_factor); - int radius = InternalUtils.scale_to_int (2, scale_factor); - int dot_spacing = InternalUtils.scale_to_int (3, scale_factor); + int top_offset = Utils.scale_to_int (10, scale_factor); + int left_offset = Utils.scale_to_int (2, scale_factor); + int radius = Utils.scale_to_int (2, scale_factor); + int dot_spacing = Utils.scale_to_int (3, scale_factor); cr.arc (left_offset + x, y + top_offset, radius, 0, 2 * Math.PI); cr.arc (left_offset + x + radius + dot_spacing, y + top_offset, radius, 0, 2 * Math.PI); cr.arc (left_offset + x + radius * 2 + dot_spacing * 2, y + top_offset, radius, 0, 2 * Math.PI); @@ -378,10 +378,10 @@ public class Gala.IconGroup : CanvasActor { window.place (x, y, size, scale_factor); - x += InternalUtils.scale_to_int (size, scale_factor) + spacing; - if (x + InternalUtils.scale_to_int (size, scale_factor) >= scaled_size) { + x += Utils.scale_to_int (size, scale_factor) + spacing; + if (x + Utils.scale_to_int (size, scale_factor) >= scaled_size) { x = x_offset; - y += InternalUtils.scale_to_int (size, scale_factor) + spacing; + y += Utils.scale_to_int (size, scale_factor) + spacing; } } } diff --git a/src/Widgets/MultitaskingView/IconGroupContainer.vala b/src/Widgets/MultitaskingView/IconGroupContainer.vala index 1919b583a..58245a0a0 100644 --- a/src/Widgets/MultitaskingView/IconGroupContainer.vala +++ b/src/Widgets/MultitaskingView/IconGroupContainer.vala @@ -115,8 +115,8 @@ public class Gala.IconGroupContainer : Clutter.Actor { * end states into account */ public float calculate_total_width () { - var spacing = InternalUtils.scale_to_int (SPACING, scale_factor); - var group_width = InternalUtils.scale_to_int (GROUP_WIDTH, scale_factor); + var spacing = Utils.scale_to_int (SPACING, scale_factor); + var group_width = Utils.scale_to_int (GROUP_WIDTH, scale_factor); var width = 0.0f; foreach (var child in get_children ()) { diff --git a/src/Widgets/MultitaskingView/MultitaskingView.vala b/src/Widgets/MultitaskingView/MultitaskingView.vala index 7a49b0245..a944b02ba 100644 --- a/src/Widgets/MultitaskingView/MultitaskingView.vala +++ b/src/Widgets/MultitaskingView/MultitaskingView.vala @@ -248,7 +248,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone var scale = display.get_monitor_scale (display.get_primary_monitor ()); icon_groups.force_reposition (); - icon_groups.y = primary_monitor_container.height - InternalUtils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET - 20, scale); + icon_groups.y = primary_monitor_container.height - Utils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET - 20, scale); reposition_icon_groups (false); if (action != MULTITASKING_VIEW) { @@ -335,8 +335,8 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone // 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) { - icon_groups.x = (-active_index * InternalUtils.scale_to_int (IconGroupContainer.SPACING + IconGroup.SIZE, scale) + primary_monitor_container.width / 2) - .clamp (primary_monitor_container.width - icon_groups_width - InternalUtils.scale_to_int (64, scale), InternalUtils.scale_to_int (64, scale)); + icon_groups.x = (-active_index * Utils.scale_to_int (IconGroupContainer.SPACING + IconGroup.SIZE, scale) + primary_monitor_container.width / 2) + .clamp (primary_monitor_container.width - icon_groups_width - Utils.scale_to_int (64, scale), Utils.scale_to_int (64, scale)); } else icon_groups.x = primary_monitor_container.width / 2 - icon_groups_width / 2; diff --git a/src/Widgets/MultitaskingView/WindowClone.vala b/src/Widgets/MultitaskingView/WindowClone.vala index 35390796a..a1a891a89 100644 --- a/src/Widgets/MultitaskingView/WindowClone.vala +++ b/src/Widgets/MultitaskingView/WindowClone.vala @@ -353,14 +353,14 @@ public class Gala.WindowClone : ActorTarget, RootTarget { var monitor_index = display.get_monitor_index_for_rect (Mtk.Rectangle.from_graphene_rect (rect, ROUND)); var monitor_scale = display.get_monitor_scale (monitor_index); - float window_title_max_width = box.get_width () - InternalUtils.scale_to_int (TITLE_MAX_WIDTH_MARGIN, monitor_scale); + float window_title_max_width = box.get_width () - Utils.scale_to_int (TITLE_MAX_WIDTH_MARGIN, monitor_scale); float window_title_height, window_title_nat_width; window_title.get_preferred_size (null, null, out window_title_nat_width, out window_title_height); var window_title_width = window_title_nat_width.clamp (0, window_title_max_width); float window_title_x = (box.get_width () - window_title_width) / 2; - float window_title_y = (window_icon.visible ? window_icon_y : box.get_height ()) - (window_title_height / 2) - InternalUtils.scale_to_int (18, monitor_scale); + float window_title_y = (window_icon.visible ? window_icon_y : box.get_height ()) - (window_title_height / 2) - Utils.scale_to_int (18, monitor_scale); var window_title_alloc = InternalUtils.actor_box_from_rect (window_title_x, window_title_y, window_title_width, window_title_height); window_title.allocate (window_title_alloc); diff --git a/src/Widgets/MultitaskingView/WindowIconActor.vala b/src/Widgets/MultitaskingView/WindowIconActor.vala index 256f51ea7..396616420 100644 --- a/src/Widgets/MultitaskingView/WindowIconActor.vala +++ b/src/Widgets/MultitaskingView/WindowIconActor.vala @@ -32,7 +32,7 @@ public class Gala.WindowIconActor : Clutter.Actor { _icon_size = value; cur_icon_scale = desired_icon_scale; - var scaled_size = InternalUtils.scale_to_int (_icon_size, cur_icon_scale); + var scaled_size = Utils.scale_to_int (_icon_size, cur_icon_scale); set_size (scaled_size, scaled_size); fade_new_icon (); diff --git a/src/Widgets/MultitaskingView/WorkspaceClone.vala b/src/Widgets/MultitaskingView/WorkspaceClone.vala index 82aa32a1f..386f0169f 100644 --- a/src/Widgets/MultitaskingView/WorkspaceClone.vala +++ b/src/Widgets/MultitaskingView/WorkspaceClone.vala @@ -286,8 +286,8 @@ public class Gala.WorkspaceClone : ActorTarget { var monitor = display.get_monitor_geometry (display.get_primary_monitor ()); - var scale = (float)(monitor.height - InternalUtils.scale_to_int (TOP_OFFSET + BOTTOM_OFFSET, monitor_scale)) / monitor.height; - var pivot_y = InternalUtils.scale_to_int (TOP_OFFSET, monitor_scale) / (monitor.height - monitor.height * scale); + var scale = (float)(monitor.height - Utils.scale_to_int (TOP_OFFSET + BOTTOM_OFFSET, monitor_scale)) / monitor.height; + var pivot_y = Utils.scale_to_int (TOP_OFFSET, monitor_scale) / (monitor.height - monitor.height * scale); background.set_pivot_point (0.5f, pivot_y); var initial_width = monitor.width; @@ -297,10 +297,10 @@ public class Gala.WorkspaceClone : ActorTarget { add_target (new PropertyTarget (MULTITASKING_VIEW, background, "scale-x", typeof (double), 1d, (double) scale)); add_target (new PropertyTarget (MULTITASKING_VIEW, background, "scale-y", typeof (double), 1d, (double) scale)); - window_container.padding_top = InternalUtils.scale_to_int (TOP_OFFSET, monitor_scale); + window_container.padding_top = Utils.scale_to_int (TOP_OFFSET, monitor_scale); window_container.padding_left = window_container.padding_right = (int)(monitor.width - monitor.width * scale) / 2; - window_container.padding_bottom = InternalUtils.scale_to_int (BOTTOM_OFFSET, monitor_scale); + window_container.padding_bottom = Utils.scale_to_int (BOTTOM_OFFSET, monitor_scale); } public override void update_progress (GestureAction action, double progress) { diff --git a/src/Widgets/MultitaskingView/WorkspaceInsertThumb.vala b/src/Widgets/MultitaskingView/WorkspaceInsertThumb.vala index cbf9bf834..583eb7134 100644 --- a/src/Widgets/MultitaskingView/WorkspaceInsertThumb.vala +++ b/src/Widgets/MultitaskingView/WorkspaceInsertThumb.vala @@ -52,9 +52,9 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor { } private void reallocate () { - width = InternalUtils.scale_to_int (IconGroupContainer.SPACING, scale_factor); - height = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH, scale_factor); - y = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH - IconGroupContainer.SPACING, scale_factor) / 2; + width = Utils.scale_to_int (IconGroupContainer.SPACING, scale_factor); + height = Utils.scale_to_int (IconGroupContainer.GROUP_WIDTH, scale_factor); + y = Utils.scale_to_int (IconGroupContainer.GROUP_WIDTH - IconGroupContainer.SPACING, scale_factor) / 2; } public void set_window_thumb (Meta.Window window) { @@ -83,12 +83,12 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor { if (!expand) { remove_transition ("pulse"); opacity = 0; - width = InternalUtils.scale_to_int (IconGroupContainer.SPACING, scale_factor); + width = Utils.scale_to_int (IconGroupContainer.SPACING, scale_factor); expanded = false; } else { add_pulse_animation (); opacity = 200; - width = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH + IconGroupContainer.SPACING * 2, scale_factor); + width = Utils.scale_to_int (IconGroupContainer.GROUP_WIDTH + IconGroupContainer.SPACING * 2, scale_factor); expanded = true; } diff --git a/src/Widgets/PointerLocator.vala b/src/Widgets/PointerLocator.vala index 79d6650c7..17195b52a 100644 --- a/src/Widgets/PointerLocator.vala +++ b/src/Widgets/PointerLocator.vala @@ -49,8 +49,8 @@ public class Gala.PointerLocator : Clutter.Actor, Clutter.Animatable { private void update_surface (float cur_scale) { if (surface == null || cur_scale != scaling_factor) { scaling_factor = cur_scale; - surface_width = InternalUtils.scale_to_int (WIDTH_PX, scaling_factor); - surface_height = InternalUtils.scale_to_int (HEIGHT_PX, scaling_factor); + surface_width = Utils.scale_to_int (WIDTH_PX, scaling_factor); + surface_height = Utils.scale_to_int (HEIGHT_PX, scaling_factor); surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, surface_width, surface_height); @@ -62,7 +62,7 @@ public class Gala.PointerLocator : Clutter.Actor, Clutter.Animatable { var radius = int.min (surface_width / 2, surface_height / 2); var cr = new Cairo.Context (surface); - var border_width = InternalUtils.scale_to_int (BORDER_WIDTH_PX, scaling_factor); + var border_width = Utils.scale_to_int (BORDER_WIDTH_PX, scaling_factor); // Clear the surface cr.save (); diff --git a/src/Widgets/WindowSwitcher/WindowSwitcher.vala b/src/Widgets/WindowSwitcher/WindowSwitcher.vala index d74f6ae53..d24f8a04b 100644 --- a/src/Widgets/WindowSwitcher/WindowSwitcher.vala +++ b/src/Widgets/WindowSwitcher/WindowSwitcher.vala @@ -98,7 +98,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget { }; shadow_effect = new ShadowEffect ("window-switcher", scaling_factor) { - border_radius = InternalUtils.scale_to_int (9, scaling_factor), + border_radius = Utils.scale_to_int (9, scaling_factor), shadow_opacity = 100 }; add_effect (shadow_effect); @@ -121,7 +121,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget { shadow_effect.monitor_scale = scaling_factor; - var margin = InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor); + var margin = Utils.scale_to_int (WRAPPER_PADDING, scaling_factor); container.margin_left = margin; container.margin_right = margin; @@ -147,7 +147,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget { container.get_preferred_size (null, null, out container_nat_width, null); var max_width = float.min ( - geom.width - InternalUtils.scale_to_int (MIN_OFFSET, scaling_factor) * 2, //Don't overflow the monitor + geom.width - Utils.scale_to_int (MIN_OFFSET, scaling_factor) * 2, //Don't overflow the monitor container_nat_width //Ellipsize the label if it's longer than the icons ); @@ -188,7 +188,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget { ctx, 0.5, 0.5, width - stroke_width, height - stroke_width, - InternalUtils.scale_to_int (9, scaling_factor) + Utils.scale_to_int (9, scaling_factor) ); ctx.set_source_rgba ( @@ -214,7 +214,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget { ctx, stroke_width + 0.5, stroke_width + 0.5, width - stroke_width * 2 - 1, height - stroke_width * 2 - 1, - InternalUtils.scale_to_int (8, scaling_factor) + Utils.scale_to_int (8, scaling_factor) ); ctx.set_line_width (stroke_width); diff --git a/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala b/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala index c85a12cda..6bb07754a 100644 --- a/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala +++ b/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala @@ -36,7 +36,7 @@ public class Gala.WindowSwitcherIcon : CanvasActor { public WindowSwitcherIcon (Meta.Window window, int icon_size, float scale_factor) { Object (window: window); - icon = new WindowIcon (window, InternalUtils.scale_to_int (icon_size, scale_factor)); + icon = new WindowIcon (window, Utils.scale_to_int (icon_size, scale_factor)); icon.add_constraint (new Clutter.AlignConstraint (this, Clutter.AlignAxis.BOTH, 0.5f)); add_child (icon); @@ -50,7 +50,7 @@ public class Gala.WindowSwitcherIcon : CanvasActor { } private void update_size () { - var indicator_size = InternalUtils.scale_to_int ( + var indicator_size = Utils.scale_to_int ( (WindowSwitcher.ICON_SIZE + WindowSwitcher.WRAPPER_PADDING * 2), scale_factor ); @@ -73,7 +73,7 @@ public class Gala.WindowSwitcherIcon : CanvasActor { rgba.blue, rgba.alpha ); - var rect_radius = InternalUtils.scale_to_int (WRAPPER_BORDER_RADIUS, scale_factor); + var rect_radius = Utils.scale_to_int (WRAPPER_BORDER_RADIUS, scale_factor); Drawing.Utilities.cairo_rounded_rectangle (ctx, 0, 0, width, height, rect_radius); ctx.set_operator (Cairo.Operator.SOURCE); ctx.fill (); diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 9041b9e1b..ffbe811f7 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -1088,10 +1088,10 @@ namespace Gala { if (actor.get_meta_window ().get_icon_geometry (out icon)) { // Fix icon position and size according to ui scaling factor. float ui_scale = get_display ().get_monitor_scale (get_display ().get_monitor_index_for_rect (icon)); - icon.x = InternalUtils.scale_to_int (icon.x, ui_scale); - icon.y = InternalUtils.scale_to_int (icon.y, ui_scale); - icon.width = InternalUtils.scale_to_int (icon.width, ui_scale); - icon.height = InternalUtils.scale_to_int (icon.height, ui_scale); + icon.x = Utils.scale_to_int (icon.x, ui_scale); + icon.y = Utils.scale_to_int (icon.y, ui_scale); + icon.width = Utils.scale_to_int (icon.width, ui_scale); + icon.height = Utils.scale_to_int (icon.height, ui_scale); float scale_x = (float)icon.width / actor.width; float scale_y = (float)icon.height / actor.height;