From bf55feceb41dc1adf90a46719bb3d3400a4ef0f4 Mon Sep 17 00:00:00 2001
From: Benjamin Palko <benjaminpalko@hotmail.com>
Date: Wed, 23 Jul 2025 10:14:25 -0400
Subject: [PATCH] make mousearea root of clickable

---
 modules/bar/components/mpris/Player.qml | 12 +++++++---
 styled/Clickable.qml                    | 30 +++++--------------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/modules/bar/components/mpris/Player.qml b/modules/bar/components/mpris/Player.qml
index 47cc619..3c7490f 100644
--- a/modules/bar/components/mpris/Player.qml
+++ b/modules/bar/components/mpris/Player.qml
@@ -27,8 +27,14 @@ Loader {
                 modelData.play();
             }
         }
-        onScrolledUp: parent.nextPlayer()
-        onScrolledDown: parent.previousPlayer()
+
+        onWheel: event => {
+            if (event.angleDelta.y > 0) {
+                parent.nextPlayer();
+            } else if (event.angleDelta.y < 0) {
+                parent.previousPlayer();
+            }
+        }
 
         StyledText {
             id: text
@@ -44,7 +50,7 @@ Loader {
 
             states: State {
                 name: "hovered"
-                when: clickable.hovered
+                when: clickable.containsMouse
                 PropertyChanges {
                     text {
                         color: Theme.palette.base300
diff --git a/styled/Clickable.qml b/styled/Clickable.qml
index ec4eff1..8f642f6 100644
--- a/styled/Clickable.qml
+++ b/styled/Clickable.qml
@@ -1,13 +1,13 @@
 import QtQuick
 import "../config/"
 
-Item {
-    id: root
+MouseArea {
+    id: mouseArea
+
     property bool disabled: false
-    property alias hovered: mouseArea.containsMouse
-    signal clicked
-    signal scrolledUp
-    signal scrolledDown
+
+    hoverEnabled: !disabled
+    cursorShape: Qt.PointingHandCursor
 
     StyledLabel {
         id: background
@@ -32,22 +32,4 @@ Item {
             }
         }
     }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-
-        hoverEnabled: !disabled
-        cursorShape: Qt.PointingHandCursor
-
-        onClicked: root.clicked()
-
-        onWheel: event => {
-            if (event.angleDelta.y > 0) {
-                root.scrolledUp();
-            } else if (event.angleDelta.y < 0) {
-                root.scrolledDown();
-            }
-        }
-    }
 }