Use enum and name it group

Author: leolost2605

lib/Gestures/GestureController.vala

@@ -19,12 +19,17 @@
  * it will be a hard boundary, if they are fractional it will slow the gesture progress when over the
  * limit simulating a kind of spring that pushes against it.
  * Note that the progress snaps to full integer values after a gesture ends.
- * Events are always shared between all GestureControllers with the same id.
+ * Events are always shared between all GestureControllers in the same group (except for the group NONE).
  * This means that two gestures that can be done in one motion (e.g. horizontal and vertical swipe)
- * can be done simultaneously if each of two GestureControllers with the same id handle one of
+ * can be done simultaneously if each of two GestureControllers in the same group handle one of
  * the gestures.
  */
 public class Gala.GestureController : Object {
+    public enum Group {
+        NONE,
+        MULTITASKING_VIEW,
+    }
+
     /**
      * When a gesture ends with a velocity greater than this constant, the action is not cancelled,
      * even if the animation threshold has not been reached.
@@ -38,7 +43,7 @@ public class Gala.GestureController : Object {
 
     public GestureAction action { get; construct; }
     public WindowManager wm { get; construct; }
-    public string? id { get; construct; }
+    public Group group { get; construct; }
 
     private unowned RootTarget? _target;
     public RootTarget target {
@@ -96,8 +101,8 @@ public class Gala.GestureController : Object {
 
     private SpringTimeline? timeline;
 
-    public GestureController (GestureAction action, WindowManager wm, string? id = null) {
-        Object (action: action, wm: wm, id: id);
+    public GestureController (GestureAction action, WindowManager wm, Group group = NONE) {
+        Object (action: action, wm: wm, group: group);
     }
 
     /**
@@ -115,7 +120,7 @@ public class Gala.GestureController : Object {
 
     public void enable_touchpad (Clutter.Actor actor) {
         if (Meta.Util.is_wayland_compositor ()) {
-            touchpad_backend = new TouchpadBackend (actor, id);
+            touchpad_backend = new TouchpadBackend (actor, group);
             touchpad_backend.on_gesture_detected.connect (gesture_detected);
             touchpad_backend.on_begin.connect (gesture_begin);
             touchpad_backend.on_update.connect (gesture_update);

lib/Gestures/TouchpadBackend.vala

@@ -19,17 +19,18 @@ private class Gala.TouchpadBackend : Object, GestureBackend {
     }
 
     public Clutter.Actor actor { get; construct; }
-    public string? id { get; construct; }
+    public GestureController.Group group { get; construct; }
 
     private static List<TouchpadBackend> instances = new List<TouchpadBackend> ();
+
     private State state = NONE;
     private GestureDirection direction = UNKNOWN;
     private double distance_x = 0;
     private double distance_y = 0;
     private double distance = 0;
 
-    public TouchpadBackend (Clutter.Actor actor, string? id) {
-        Object (actor: actor, id: id);
+    public TouchpadBackend (Clutter.Actor actor, GestureController.Group group) {
+        Object (actor: actor, group: group);
     }
 
     ~TouchpadBackend () {
@@ -102,9 +103,9 @@ private class Gala.TouchpadBackend : Object, GestureBackend {
 
             state = ONGOING;
             on_begin (0, event.get_time ());
-        } else if (main_handler && id != null) {
+        } else if (main_handler && group != NONE) {
             foreach (var instance in instances) {
-                if (instance != this && instance.id == id) {
+                if (instance != this && instance.group == group) {
                     instance.handle_event (event, false);
                 }
             }

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -23,8 +23,6 @@
 public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableComponent {
     public const int ANIMATION_DURATION = 250;
 
-    private const string GESTURE_CONTROLLER_ID = "multitaskingview";
-
     private GestureController workspaces_gesture_controller;
     private GestureController multitasking_gesture_controller;
 
@@ -60,15 +58,15 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         opened = false;
         display = wm.get_display ();
 
-        multitasking_gesture_controller = new GestureController (MULTITASKING_VIEW, wm, GESTURE_CONTROLLER_ID);
+        multitasking_gesture_controller = new GestureController (MULTITASKING_VIEW, wm, MULTITASKING_VIEW);
         multitasking_gesture_controller.enable_touchpad (wm.stage);
         add_gesture_controller (multitasking_gesture_controller);
 
         add_target (ShellClientsManager.get_instance ()); // For hiding the panels
 
         workspaces = new WorkspaceRow (display);
 
-        workspaces_gesture_controller = new GestureController (SWITCH_WORKSPACE, wm, GESTURE_CONTROLLER_ID) {
+        workspaces_gesture_controller = new GestureController (SWITCH_WORKSPACE, wm, MULTITASKING_VIEW) {
             overshoot_upper_clamp = 0.1
         };
         workspaces_gesture_controller.enable_touchpad (wm.stage);