Skip to content

Commit 3ebaafc

Browse files
committed
Set monitor scale when opening
1 parent 9684c3f commit 3ebaafc

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/Widgets/WindowSwitcher/WindowSwitcher.vala

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
1616
public Clutter.Actor? actor { get { return this; } }
1717
public WindowManager wm { get; construct; }
1818
public bool opened { get; private set; default = false; }
19-
public float monitor_scale { get; private set; }
19+
public float monitor_scale { get; private set; default = 1.0f; }
2020

2121
private GestureController gesture_controller;
2222
private int modifier_mask;
@@ -93,10 +93,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
9393
orientation = VERTICAL
9494
};
9595

96-
unowned var display = wm.get_display ();
97-
monitor_scale = display.get_monitor_scale (display.get_primary_monitor ());
9896
notify["monitor-scale"].connect (scale);
99-
10097
scale ();
10198

10299
shadow_effect = new ShadowEffect ("window-switcher", monitor_scale) {
@@ -116,11 +113,6 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
116113
// Redraw the components if the colour scheme changes.
117114
style_manager.notify["prefers-color-scheme"].connect (content.invalidate);
118115

119-
unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
120-
monitor_manager.monitors_changed.connect (() => {
121-
monitor_scale = display.get_monitor_scale (display.get_primary_monitor ());
122-
});
123-
124116
notify["opacity"].connect (() => visible = opacity != 0);
125117
}
126118

@@ -334,6 +326,8 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
334326
container.remove_all_children ();
335327
select_icon (null);
336328

329+
monitor_scale = display.get_monitor_scale (display.get_current_monitor ());
330+
337331
var windows = display.get_tab_list (Meta.TabList.NORMAL, workspace);
338332
if (windows == null) {
339333
return false;
@@ -357,6 +351,8 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
357351
container.remove_all_children ();
358352
select_icon (null);
359353

354+
monitor_scale = display.get_monitor_scale (display.get_current_monitor ());
355+
360356
var windows = display.get_tab_list (Meta.TabList.NORMAL, workspace);
361357
if (windows == null) {
362358
return false;

0 commit comments

Comments
 (0)