diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala index 989b280c4..07eae8ded 100644 --- a/src/Widgets/WindowClone.vala +++ b/src/Widgets/WindowClone.vala @@ -53,7 +53,7 @@ public class Gala.WindowClone : Clutter.Actor { } public bool overview_mode { get; construct; } - public GestureTracker? gesture_tracker { get; construct; } + public GestureTracker gesture_tracker { get; construct; } private float _monitor_scale_factor = 1.0f; public float monitor_scale_factor { get { @@ -94,7 +94,7 @@ public class Gala.WindowClone : Clutter.Actor { private Clutter.Actor window_icon; private Tooltip window_title; - public WindowClone (Meta.Display display, Meta.Window window, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) { + public WindowClone (Meta.Display display, Meta.Window window, GestureTracker gesture_tracker, float scale, bool overview_mode = false) { Object ( display: display, window: window, diff --git a/src/Widgets/WindowCloneContainer.vala b/src/Widgets/WindowCloneContainer.vala index 0e9bdea6a..3431c5616 100644 --- a/src/Widgets/WindowCloneContainer.vala +++ b/src/Widgets/WindowCloneContainer.vala @@ -29,7 +29,7 @@ namespace Gala { public int padding_bottom { get; set; default = 12; } public Meta.Display display { get; construct; } - public GestureTracker? gesture_tracker { get; construct; } + public GestureTracker gesture_tracker { get; construct; } public bool overview_mode { get; construct; } private float _monitor_scale = 1.0f; @@ -53,7 +53,7 @@ namespace Gala { */ private unowned WindowClone? current_window = null; - public WindowCloneContainer (Meta.Display display, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) { + public WindowCloneContainer (Meta.Display display, GestureTracker gesture_tracker, float scale, bool overview_mode = false) { Object (display: display, gesture_tracker: gesture_tracker, monitor_scale: scale, overview_mode: overview_mode); } diff --git a/src/Widgets/WindowOverview.vala b/src/Widgets/WindowOverview.vala index 3d349045d..dda2272e9 100644 --- a/src/Widgets/WindowOverview.vala +++ b/src/Widgets/WindowOverview.vala @@ -11,14 +11,15 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent { private const int BOTTOM_GAP = 100; public WindowManager wm { get; construct; } + public GestureTracker gesture_tracker { get; construct; } // Currently only used to allow us to use GesturePropertyTransitions private ModalProxy modal_proxy; // the workspaces which we expose right now private List workspaces; private WindowCloneContainer window_clone_container; - public WindowOverview (WindowManager wm) { - Object (wm : wm); + public WindowOverview (WindowManager wm, GestureTracker gesture_tracker) { + Object (wm : wm, gesture_tracker: gesture_tracker); } construct { @@ -123,7 +124,7 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent { var geometry = display.get_monitor_geometry (i); var scale = display.get_monitor_scale (i); - window_clone_container = new WindowCloneContainer (display, null, scale, true) { + window_clone_container = new WindowCloneContainer (display, gesture_tracker, scale, true) { padding_top = TOP_GAP, padding_left = BORDER, padding_right = BORDER, diff --git a/src/WindowManager.vala b/src/WindowManager.vala index 52478722f..9819565d9 100644 --- a/src/WindowManager.vala +++ b/src/WindowManager.vala @@ -287,7 +287,7 @@ namespace Gala { if (plugin_manager.window_overview_provider == null || (window_overview = (plugin_manager.get_plugin (plugin_manager.window_overview_provider) as ActivatableComponent)) == null ) { - window_overview = new WindowOverview (this); + window_overview = new WindowOverview (this, gesture_tracker); ui_group.add_child ((Clutter.Actor) window_overview); }