Skip to content

Cleanup InternalUtils.set_input_area #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Cleanup InternalUtils.set_input_area #2166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea50174
Cleanup `InternalUtils.set_input_area`
lenemter Dec 13, 2024
6401f70
Merge branch 'main' into lenemter/cleanup-input-area
lenemter Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions src/InternalUtils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,37 +27,24 @@ namespace Gala {
}

X.Xrectangle[] rects = {};
int width, height;
display.get_size (out width, out height);
var geometry = display.get_monitor_geometry (display.get_primary_monitor ());

switch (area) {
case InputArea.FULLSCREEN:
int width, height;
display.get_size (out width, out height);

X.Xrectangle rect = {0, 0, (ushort)width, (ushort)height};
rects = {rect};
break;
case InputArea.DEFAULT:
var settings = new GLib.Settings ("io.elementary.desktop.wm.behavior");

// if ActionType is NONE make it 0 sized
ushort tl_size = (settings.get_enum ("hotcorner-topleft") != ActionType.NONE ? 1 : 0);
ushort tr_size = (settings.get_enum ("hotcorner-topright") != ActionType.NONE ? 1 : 0);
ushort bl_size = (settings.get_enum ("hotcorner-bottomleft") != ActionType.NONE ? 1 : 0);
ushort br_size = (settings.get_enum ("hotcorner-bottomright") != ActionType.NONE ? 1 : 0);

X.Xrectangle topleft = {(short)geometry.x, (short)geometry.y, tl_size, tl_size};
X.Xrectangle topright = {(short)(geometry.x + geometry.width - 1), (short)geometry.y, tr_size, tr_size};
X.Xrectangle bottomleft = {(short)geometry.x, (short)(geometry.y + geometry.height - 1), bl_size, bl_size};
X.Xrectangle bottomright = {(short)(geometry.x + geometry.width - 1), (short)(geometry.y + geometry.height - 1), br_size, br_size};

rects = {topleft, topright, bottomleft, bottomright};

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

break;

case InputArea.NONE:
default:
#if !HAS_MUTTER44
Expand Down
Loading