dankbar: fix widget hover effects

2025-12-08 06:25:37 -05:00 · 2025-10-25 11:57:56 -04:00
parent 42f9edf566
commit 7e75c9e510
19 changed files with 6 additions and 23 deletions
--- a/Modules/DankBar/Widgets/Battery.qml
+++ b/Modules/DankBar/Widgets/Battery.qml
@@ -99,7 +99,6 @@ BasePill {
        y: -battery.topMargin
        width: battery.width + battery.leftMargin + battery.rightMargin
        height: battery.height + battery.topMargin + battery.bottomMargin
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/Clock.qml
+++ b/Modules/DankBar/Widgets/Clock.qml
@@ -243,7 +243,6 @@ BasePill {
        y: -root.topMargin
        width: root.width + root.leftMargin + root.rightMargin
        height: root.height + root.topMargin + root.bottomMargin
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onPressed: {
            if (root.popoutTarget && root.popoutTarget.setTriggerPosition) {
--- a/Modules/DankBar/Widgets/ColorPicker.qml
+++ b/Modules/DankBar/Widgets/ColorPicker.qml
@@ -27,7 +27,6 @@ BasePill {
    MouseArea {
        z: 1
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onPressed: {
            root.colorPickerRequested()
--- a/Modules/DankBar/Widgets/ControlCenterButton.qml
+++ b/Modules/DankBar/Widgets/ControlCenterButton.qml
@@ -86,7 +86,6 @@ BasePill {

                    MouseArea {
                        anchors.fill: parent
-                        hoverEnabled: true
                        acceptedButtons: Qt.NoButton
                        onWheel: function(wheelEvent) {
                            let delta = wheelEvent.angleDelta.y
@@ -188,7 +187,6 @@ BasePill {
                        id: audioWheelArea

                        anchors.fill: parent
-                        hoverEnabled: true
                        acceptedButtons: Qt.NoButton
                        onWheel: function(wheelEvent) {
                            let delta = wheelEvent.angleDelta.y;
@@ -232,7 +230,6 @@ BasePill {
        y: -root.topMargin
        width: root.width + root.leftMargin + root.rightMargin
        height: root.height + root.topMargin + root.bottomMargin
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/CpuMonitor.qml
+++ b/Modules/DankBar/Widgets/CpuMonitor.qml
@@ -122,7 +122,6 @@ BasePill {

    MouseArea {
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/CpuTemperature.qml
+++ b/Modules/DankBar/Widgets/CpuTemperature.qml
@@ -122,7 +122,6 @@ BasePill {

    MouseArea {
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/DiskUsage.qml
+++ b/Modules/DankBar/Widgets/DiskUsage.qml
@@ -10,6 +10,7 @@ BasePill {

    property var widgetData: null
    property string mountPath: (widgetData && widgetData.mountPath !== undefined) ? widgetData.mountPath : "/"
+    property bool isHovered: mouseArea.containsMouse

    property var selectedMount: {
        if (!DgopService.diskMounts || DgopService.diskMounts.length === 0) {
@@ -193,6 +194,7 @@ BasePill {
    }

    MouseArea {
+        id: mouseArea
        z: 1
        anchors.fill: parent
        hoverEnabled: root.isVerticalOrientation
--- a/Modules/DankBar/Widgets/FocusedApp.qml
+++ b/Modules/DankBar/Widgets/FocusedApp.qml
@@ -17,6 +17,7 @@ BasePill {
    readonly property int maxCompactWidth: 288
    readonly property Toplevel activeWindow: ToplevelManager.activeToplevel
    property var activeDesktopEntry: null
+    property bool isHovered: mouseArea.containsMouse

    Component.onCompleted: {
        updateDesktopEntry()
--- a/Modules/DankBar/Widgets/GpuTemperature.qml
+++ b/Modules/DankBar/Widgets/GpuTemperature.qml
@@ -186,7 +186,6 @@ BasePill {

    MouseArea {
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/IdleInhibitor.qml
+++ b/Modules/DankBar/Widgets/IdleInhibitor.qml
@@ -26,7 +26,6 @@ BasePill {
    MouseArea {
        z: 1
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onClicked: {
            SessionService.toggleIdleInhibit()
--- a/Modules/DankBar/Widgets/KeyboardLayoutName.qml
+++ b/Modules/DankBar/Widgets/KeyboardLayoutName.qml
@@ -66,7 +66,6 @@ BasePill {
    MouseArea {
        z: 1
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onClicked: {
            if (CompositorService.isNiri) {
--- a/Modules/DankBar/Widgets/LauncherButton.qml
+++ b/Modules/DankBar/Widgets/LauncherButton.qml
@@ -84,7 +84,6 @@ BasePill {
    MouseArea {
        id: customMouseArea
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.RightButton
        onPressed: function (mouse){
--- a/Modules/DankBar/Widgets/Media.qml
+++ b/Modules/DankBar/Widgets/Media.qml
@@ -256,7 +256,6 @@ BasePill {
                            id: prevArea
                            anchors.fill: parent
                            enabled: root.playerAvailable
-                            hoverEnabled: true
                            cursorShape: Qt.PointingHandCursor
                            onClicked: {
                                if (activePlayer) {
@@ -314,7 +313,6 @@ BasePill {
                            id: nextArea
                            anchors.fill: parent
                            enabled: root.playerAvailable
-                            hoverEnabled: true
                            cursorShape: Qt.PointingHandCursor
                            onClicked: {
                                if (activePlayer) {
--- a/Modules/DankBar/Widgets/RamMonitor.qml
+++ b/Modules/DankBar/Widgets/RamMonitor.qml
@@ -122,7 +122,6 @@ BasePill {

    MouseArea {
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        acceptedButtons: Qt.LeftButton
        onPressed: {
--- a/Modules/DankBar/Widgets/SystemTrayBar.qml
+++ b/Modules/DankBar/Widgets/SystemTrayBar.qml
@@ -131,7 +131,6 @@ Item {

                        anchors.fill: parent
                        acceptedButtons: Qt.LeftButton | Qt.RightButton
-                        hoverEnabled: true
                        cursorShape: Qt.PointingHandCursor
                        onClicked: (mouse) => {
                            if (!delegateRoot.trayItem) {
@@ -218,7 +217,6 @@ Item {

                        anchors.fill: parent
                        acceptedButtons: Qt.LeftButton | Qt.RightButton
-                        hoverEnabled: true
                        cursorShape: Qt.PointingHandCursor
                        onClicked: (mouse) => {
                            if (!delegateRoot.trayItem) {
@@ -486,7 +484,6 @@ Item {
                            MouseArea {
                                id: backArea
                                anchors.fill: parent
-                                hoverEnabled: true
                                cursorShape: Qt.PointingHandCursor
                                onClicked: menuRoot.goBack()
                            }
@@ -522,7 +519,6 @@ Item {
                                    id: itemArea
                                    anchors.fill: parent
                                    enabled: !menuEntry?.isSeparator && (menuEntry?.enabled !== false)
-                                    hoverEnabled: true
                                    cursorShape: Qt.PointingHandCursor

                                    onClicked: {
--- a/Modules/DankBar/Widgets/SystemUpdate.qml
+++ b/Modules/DankBar/Widgets/SystemUpdate.qml
@@ -122,7 +122,6 @@ BasePill {
    MouseArea {
        z: 1
        anchors.fill: parent
-        hoverEnabled: true
        cursorShape: Qt.PointingHandCursor
        onPressed: {
            if (popoutTarget && popoutTarget.setTriggerPosition) {
--- a/Modules/DankBar/Widgets/Vpn.qml
+++ b/Modules/DankBar/Widgets/Vpn.qml
@@ -13,6 +13,7 @@ BasePill {
    }

    property var popoutTarget: null
+    property bool isHovered: clickArea.containsMouse

    signal toggleVpnPopup()

--- a/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -588,7 +588,6 @@ Item {

                                        MouseArea {
                                            id: appMouseArea
-                                            hoverEnabled: true
                                            anchors.fill: parent
                                            enabled: isActive
                                            cursorShape: Qt.PointingHandCursor
@@ -657,7 +656,6 @@ Item {

                                        MouseArea {
                                            id: appMouseArea
-                                            hoverEnabled: true
                                            anchors.fill: parent
                                            enabled: isActive
                                            cursorShape: Qt.PointingHandCursor