Skip to content

Commit f4590ff

Browse files
committed
Adjust to barriers in HideTracker
1 parent c6a68a8 commit f4590ff

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

src/ShellClients/HideTracker.vala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,7 @@ public class Gala.HideTracker : Object {
1616
public Meta.Display display { get; construct; }
1717
public unowned PanelWindow panel { get; construct; }
1818

19-
private Pantheon.Desktop.HideMode _hide_mode = NEVER;
20-
public Pantheon.Desktop.HideMode hide_mode {
21-
get {
22-
return _hide_mode;
23-
}
24-
set {
25-
_hide_mode = value;
26-
27-
setup_barrier ();
28-
}
29-
}
19+
public Pantheon.Desktop.HideMode hide_mode { get; set; }
3020

3121
private Clutter.PanAction pan_action;
3222

@@ -93,6 +83,16 @@ public class Gala.HideTracker : Object {
9383
pan_action.pan.connect (on_pan);
9484

9585
display.get_stage ().add_action_full ("panel-swipe-gesture", CAPTURE, pan_action);
86+
87+
panel.notify["anchor"].connect (setup_barrier);
88+
89+
var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
90+
monitor_manager.monitors_changed.connect (() => {
91+
setup_barrier (); //Make sure barriers are still on the primary monitor
92+
schedule_update ();
93+
});
94+
95+
setup_barrier ();
9696
}
9797

9898
//Can be removed with mutter > 45

src/ShellClients/PanelWindow.vala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public class Gala.PanelWindow : Object {
3737

3838
var display = wm.get_display ();
3939

40-
var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
41-
monitor_manager.monitors_changed.connect (() => set_hide_mode (clone.hide_mode)); //Make sure barriers are still on the primary monitor
42-
4340
var workspace_manager = display.get_workspace_manager ();
4441
workspace_manager.workspace_added.connect (update_strut);
4542
workspace_manager.workspace_removed.connect (update_strut);
@@ -49,10 +46,7 @@ public class Gala.PanelWindow : Object {
4946

5047
window_positioner = new WindowPositioner (display, window, WindowPositioner.Position.from_anchor (anchor));
5148

52-
notify["anchor"].connect (() => {
53-
window_positioner.position = WindowPositioner.Position.from_anchor (anchor);
54-
set_hide_mode (clone.hide_mode); // Resetup barriers etc., TODO: replace with update_strut once barriers are handled in hidetracker
55-
});
49+
notify["anchor"].connect (() => window_positioner.position = WindowPositioner.Position.from_anchor (anchor));
5650
}
5751

5852
#if HAS_MUTTER45

0 commit comments

Comments
 (0)