Skip to content

PanelWindow: Remove offset #2085

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

Closed
wants to merge 2 commits into from
Closed

PanelWindow: Remove offset #2085

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d5b6f2
PanelWindow: Remove offset
lenemter Oct 13, 2024
b3a64a3
Remove scale
lenemter Oct 13, 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
24 changes: 10 additions & 14 deletions src/ShellClients/PanelWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/

public class Gala.PanelWindow : Object {
private const int BARRIER_OFFSET = 50; // Allow hot corner trigger

private static HashTable<Meta.Window, Meta.Strut?> window_struts = new HashTable<Meta.Window, Meta.Strut?> (null, null);

public WindowManager wm { get; construct; }
Expand Down Expand Up @@ -211,16 +209,14 @@ public class Gala.PanelWindow : Object {
private void setup_barrier () {
var display = wm.get_display ();
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);

switch (anchor) {
case TOP:
setup_barrier_top (monitor_geom, offset);
setup_barrier_top (monitor_geom);
break;

case BOTTOM:
setup_barrier_bottom (monitor_geom, offset);
setup_barrier_bottom (monitor_geom);
break;

default:
Expand All @@ -230,15 +226,15 @@ public class Gala.PanelWindow : Object {
}

#if HAS_MUTTER45
private void setup_barrier_top (Mtk.Rectangle monitor_geom, int offset) {
private void setup_barrier_top (Mtk.Rectangle monitor_geom) {
#else
private void setup_barrier_top (Meta.Rectangle monitor_geom, int offset) {
private void setup_barrier_top (Meta.Rectangle monitor_geom) {
#endif
barrier = new Barrier (
wm.get_display ().get_context ().get_backend (),
monitor_geom.x + offset,
monitor_geom.x,
monitor_geom.y,
monitor_geom.x + monitor_geom.width - offset,
monitor_geom.x + monitor_geom.width,
monitor_geom.y,
POSITIVE_Y,
0,
Expand All @@ -251,15 +247,15 @@ public class Gala.PanelWindow : Object {
}

#if HAS_MUTTER45
private void setup_barrier_bottom (Mtk.Rectangle monitor_geom, int offset) {
private void setup_barrier_bottom (Mtk.Rectangle monitor_geom) {
#else
private void setup_barrier_bottom (Meta.Rectangle monitor_geom, int offset) {
private void setup_barrier_bottom (Meta.Rectangle monitor_geom) {
#endif
barrier = new Barrier (
wm.get_display ().get_context ().get_backend (),
monitor_geom.x + offset,
monitor_geom.x,
monitor_geom.y + monitor_geom.height,
monitor_geom.x + monitor_geom.width - offset,
monitor_geom.x + monitor_geom.width,
monitor_geom.y + monitor_geom.height,
NEGATIVE_Y,
0,
Expand Down