Skip to content

Commit 178515b

Browse files
authored
Merge branch 'main' into leolost/internal-utils-wait-for-window-actor
2 parents 7ca26ee + b80927a commit 178515b

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

src/InternalUtils.vala

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,24 @@ namespace Gala {
2727
}
2828

2929
X.Xrectangle[] rects = {};
30-
int width, height;
31-
display.get_size (out width, out height);
32-
var geometry = display.get_monitor_geometry (display.get_primary_monitor ());
3330

3431
switch (area) {
3532
case InputArea.FULLSCREEN:
33+
int width, height;
34+
display.get_size (out width, out height);
35+
3636
X.Xrectangle rect = {0, 0, (ushort)width, (ushort)height};
3737
rects = {rect};
3838
break;
39-
case InputArea.DEFAULT:
40-
var settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");
41-
42-
// if ActionType is NONE make it 0 sized
43-
ushort tl_size = (settings.get_enum ("hotcorner-topleft") != ActionType.NONE ? 1 : 0);
44-
ushort tr_size = (settings.get_enum ("hotcorner-topright") != ActionType.NONE ? 1 : 0);
45-
ushort bl_size = (settings.get_enum ("hotcorner-bottomleft") != ActionType.NONE ? 1 : 0);
46-
ushort br_size = (settings.get_enum ("hotcorner-bottomright") != ActionType.NONE ? 1 : 0);
47-
48-
X.Xrectangle topleft = {(short)geometry.x, (short)geometry.y, tl_size, tl_size};
49-
X.Xrectangle topright = {(short)(geometry.x + geometry.width - 1), (short)geometry.y, tr_size, tr_size};
50-
X.Xrectangle bottomleft = {(short)geometry.x, (short)(geometry.y + geometry.height - 1), bl_size, bl_size};
51-
X.Xrectangle bottomright = {(short)(geometry.x + geometry.width - 1), (short)(geometry.y + geometry.height - 1), br_size, br_size};
52-
53-
rects = {topleft, topright, bottomleft, bottomright};
5439

40+
case InputArea.DEFAULT:
5541
// add plugin's requested areas
5642
foreach (var rect in PluginManager.get_default ().get_regions ()) {
5743
rects += rect;
5844
}
5945

6046
break;
47+
6148
case InputArea.NONE:
6249
default:
6350
#if !HAS_MUTTER44

0 commit comments

Comments
 (0)