Skip to content

Commit 2d557b8

Browse files
committed
MultitaskingView: Use touchscreen backend
1 parent 38db478 commit 2d557b8

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/Widgets/MultitaskingView/MultitaskingView.vala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
* preparing the wm, opening the components and holds containers for
2121
* the icon groups, the WorkspaceClones and the MonitorClones.
2222
*/
23-
public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableComponent {
23+
public class Gala.MultitaskingView : ActorTarget, RootTarget, TouchscreenTarget, ActivatableComponent {
2424
public const int ANIMATION_DURATION = 250;
2525

2626
private GestureController workspaces_gesture_controller;
2727
private GestureController multitasking_gesture_controller;
2828

2929
public Clutter.Actor? actor { get { return this; } }
30+
public float travel_distance {
31+
get { return display.get_monitor_geometry (display.get_primary_monitor ()).height / 2; }
32+
}
3033
public WindowManagerGala wm { get; construct; }
3134

3235
private Meta.Display display;
@@ -38,7 +41,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
3841
#if OLD_ICON_GROUPS
3942
private IconGroupContainer icon_groups;
4043
#endif
41-
private ActorTarget workspaces;
44+
private WorkspaceRow workspaces;
4245
private Clutter.Actor primary_monitor_container;
4346
private Clutter.BrightnessContrastEffect brightness_effect;
4447
private BackgroundManager? blurred_bg = null;
@@ -63,6 +66,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
6366

6467
multitasking_gesture_controller = new GestureController (MULTITASKING_VIEW, wm, MULTITASKING_VIEW);
6568
multitasking_gesture_controller.enable_touchpad (wm.stage);
69+
multitasking_gesture_controller.enable_touchscreen (wm.stage, this);
6670
add_gesture_controller (multitasking_gesture_controller);
6771

6872
add_target (ShellClientsManager.get_instance ()); // For hiding the panels
@@ -74,6 +78,7 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
7478
follow_natural_scroll = true,
7579
};
7680
workspaces_gesture_controller.enable_touchpad (wm.stage);
81+
workspaces_gesture_controller.enable_touchscreen (wm.stage, workspaces);
7782
workspaces_gesture_controller.enable_scroll (this, HORIZONTAL);
7883
add_gesture_controller (workspaces_gesture_controller);
7984

src/Widgets/MultitaskingView/WorkspaceRow.vala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
* Authored by: Leonhard Kargl <[email protected]>
66
*/
77

8-
public class Gala.WorkspaceRow : ActorTarget {
8+
public class Gala.WorkspaceRow : ActorTarget, TouchscreenTarget {
99
public const int WORKSPACE_GAP = 24;
1010

11+
public float travel_distance { get { return (!) (get_first_child ()?.get_width () ?? 0); } }
1112
public Meta.Display display { get; construct; }
1213

1314
public WorkspaceRow (Meta.Display display) {

0 commit comments

Comments
 (0)