Skip to content

Commit 5bb3e80

Browse files
Fix window overview (#2181)
Co-authored-by: Leo <[email protected]>
1 parent d6a0103 commit 5bb3e80

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

src/Widgets/WindowClone.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class Gala.WindowClone : Clutter.Actor {
5353
}
5454

5555
public bool overview_mode { get; construct; }
56-
public GestureTracker? gesture_tracker { get; construct; }
56+
public GestureTracker gesture_tracker { get; construct; }
5757
private float _monitor_scale_factor = 1.0f;
5858
public float monitor_scale_factor {
5959
get {
@@ -94,7 +94,7 @@ public class Gala.WindowClone : Clutter.Actor {
9494
private Clutter.Actor window_icon;
9595
private Tooltip window_title;
9696

97-
public WindowClone (Meta.Display display, Meta.Window window, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
97+
public WindowClone (Meta.Display display, Meta.Window window, GestureTracker gesture_tracker, float scale, bool overview_mode = false) {
9898
Object (
9999
display: display,
100100
window: window,

src/Widgets/WindowCloneContainer.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Gala {
2929
public int padding_bottom { get; set; default = 12; }
3030

3131
public Meta.Display display { get; construct; }
32-
public GestureTracker? gesture_tracker { get; construct; }
32+
public GestureTracker gesture_tracker { get; construct; }
3333
public bool overview_mode { get; construct; }
3434

3535
private float _monitor_scale = 1.0f;
@@ -53,7 +53,7 @@ namespace Gala {
5353
*/
5454
private unowned WindowClone? current_window = null;
5555

56-
public WindowCloneContainer (Meta.Display display, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
56+
public WindowCloneContainer (Meta.Display display, GestureTracker gesture_tracker, float scale, bool overview_mode = false) {
5757
Object (display: display, gesture_tracker: gesture_tracker, monitor_scale: scale, overview_mode: overview_mode);
5858
}
5959

src/Widgets/WindowOverview.vala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent {
1111
private const int BOTTOM_GAP = 100;
1212

1313
public WindowManager wm { get; construct; }
14+
public GestureTracker gesture_tracker { get; construct; } // Currently only used to allow us to use GesturePropertyTransitions
1415

1516
private ModalProxy modal_proxy;
1617
// the workspaces which we expose right now
1718
private List<Meta.Workspace> workspaces;
1819
private WindowCloneContainer window_clone_container;
1920

20-
public WindowOverview (WindowManager wm) {
21-
Object (wm : wm);
21+
public WindowOverview (WindowManager wm, GestureTracker gesture_tracker) {
22+
Object (wm : wm, gesture_tracker: gesture_tracker);
2223
}
2324

2425
construct {
@@ -123,7 +124,7 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent {
123124
var geometry = display.get_monitor_geometry (i);
124125
var scale = display.get_monitor_scale (i);
125126

126-
window_clone_container = new WindowCloneContainer (display, null, scale, true) {
127+
window_clone_container = new WindowCloneContainer (display, gesture_tracker, scale, true) {
127128
padding_top = TOP_GAP,
128129
padding_left = BORDER,
129130
padding_right = BORDER,

src/WindowManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ namespace Gala {
287287
if (plugin_manager.window_overview_provider == null
288288
|| (window_overview = (plugin_manager.get_plugin (plugin_manager.window_overview_provider) as ActivatableComponent)) == null
289289
) {
290-
window_overview = new WindowOverview (this);
290+
window_overview = new WindowOverview (this, gesture_tracker);
291291
ui_group.add_child ((Clutter.Actor) window_overview);
292292
}
293293

0 commit comments

Comments
 (0)