dont hijack the whole player view for now-player activation

vixalien · Oct 30, 2023 · 2820734 · 2820734
1 parent 71a272b
commit 2820734
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/data/ui/components/player/full.blp b/data/ui/components/player/full.blp
@@ -1,5 +1,6 @@
 using Gtk 4.0;
 using Adw 1;
+using Gdk 4.0;
 
 template $FullPlayerView : ActionBar {
   // to make the thumbnail look aligned
@@ -13,6 +14,13 @@ template $FullPlayerView : ActionBar {
     $PlayerPreview {
       valign: center;
       size: 74;
+      cursor: Gdk.Cursor {
+        name: "pointer";
+      };
+
+      GestureClick {
+        pressed => $gesture_pressed_cb();
+      }
     }
 
     Box now_playing_labels {

diff --git a/data/ui/components/player/mini.blp b/data/ui/components/player/mini.blp
@@ -12,6 +12,7 @@ template $MiniPlayerView : Overlay {
       margin-top: 6;
       margin-start: 6;
       margin-end: 6;
+      hexpand: true;
 
       $PlayerPreview player_preview {
         valign: center;
@@ -40,6 +41,10 @@ template $MiniPlayerView : Overlay {
           ellipsize: end;
         }
       }
+
+      GestureClick {
+        pressed => $gesture_pressed_cb();
+      }
     }
 
     Box buttons {

diff --git a/src/components/player/full.ts b/src/components/player/full.ts
@@ -179,6 +179,15 @@ export class FullPlayerView extends Gtk.ActionBar {
       : track.duration ?? "00:00";
   }
 
+  private gesture_pressed_cb(gesture: Gtk.Gesture) {
+    gesture.set_state(Gtk.EventSequenceState.CLAIMED);
+
+    this.activate_action(
+      "win.visible-view",
+      GLib.Variant.new_string("now-playing"),
+    );
+  }
+
   vfunc_map(): void {
     this.listeners.clear();
     this.setup_player();

diff --git a/src/components/player/mini.ts b/src/components/player/mini.ts
@@ -92,4 +92,13 @@ export class MiniPlayerView extends Gtk.Overlay {
     this.listeners.clear();
     super.vfunc_unmap();
   }
+
+  private gesture_pressed_cb(gesture: Gtk.Gesture) {
+    gesture.set_state(Gtk.EventSequenceState.CLAIMED);
+
+    this.activate_action(
+      "win.visible-view",
+      GLib.Variant.new_string("now-playing"),
+    );
+  }
 }
diff --git a/src/components/player/view.ts b/src/components/player/view.ts
@@ -38,22 +38,5 @@ export class PlayerView extends Adw.Bin {
     this.squeezer.add(this.mini);
 
     this.set_child(this.squeezer);
-
-    const gesture = new Gtk.GestureClick({
-      button: 1,
-    });
-
-    gesture.connect("pressed", this.gesture_pressed_cb.bind(this));
-
-    this.add_controller(gesture);
-  }
-
-  private gesture_pressed_cb(gesture: Gtk.Gesture) {
-    gesture.set_state(Gtk.EventSequenceState.CLAIMED);
-
-    this.activate_action(
-      "win.visible-view",
-      GLib.Variant.new_string("now-playing"),
-    );
   }
 }