fix: add support for touchscreen (#247)

fix #87
oae · Dec 16, 2023 · 2361af0 · 2361af0
1 parent 24f4457
commit 2361af0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/src/components/indicator/settingsMenu.ts b/src/components/indicator/settingsMenu.ts
@@ -112,17 +112,14 @@ export class SettingsMenu extends panelMenu.Button {
   }
 
   vfunc_event(event: Clutter.Event) {
-    if (!this.menu || event.type() !== Clutter.EventType.BUTTON_PRESS) {
-      return Clutter.EVENT_PROPAGATE;
-    }
-
-    if (event.get_button() === Clutter.BUTTON_PRIMARY || event.get_button() === Clutter.BUTTON_MIDDLE) {
+    if (
+      this.menu &&
+      event.type() === Clutter.EventType.BUTTON_PRESS &&
+      [Clutter.BUTTON_PRIMARY, Clutter.BUTTON_MIDDLE].includes(event.get_button())
+    ) {
       this.onToggle();
-    } else if (event.get_button() === Clutter.BUTTON_SECONDARY) {
-      this.menu.toggle();
     }
-
-    return Clutter.EVENT_PROPAGATE;
+    return super.vfunc_event(event);
   }
 
   destroy() {

diff --git a/src/components/monitorBox.ts b/src/components/monitorBox.ts
@@ -73,6 +73,14 @@ export class MonitorBox extends St1.BoxLayout {
     this.hide();
   }
 
+  override vfunc_touch_event(event: Clutter.Event): boolean {
+    if (event.type() === Clutter.EventType.TOUCH_END) {
+      this.emit('hide_window');
+      return Clutter.EVENT_STOP;
+    }
+    return Clutter.EVENT_PROPAGATE;
+  }
+
   override destroy(): void {
     super.destroy();
   }

diff --git a/src/components/panoItem.ts b/src/components/panoItem.ts
@@ -222,6 +222,14 @@ export class PanoItem extends St1.BoxLayout {
     return Clutter.EVENT_PROPAGATE;
   }
 
+  override vfunc_touch_event(event: Clutter.Event): boolean {
+    if (event.type() === Clutter.EventType.TOUCH_END) {
+      this.emit('activated');
+      return Clutter.EVENT_STOP;
+    }
+    return Clutter.EVENT_PROPAGATE;
+  }
+
   override destroy(): void {
     if (this.timeoutId) {
       GLib.Source.remove(this.timeoutId);