Merge pull request #25910 from cbjeukendrup/disable_hover_for_disable…

…d_items Disable hover state for all disabled UI elements
musescore · Jan 8, 2025 · 31c4159 · 31c4159
2 parents 10df670 + 0026608
commit 31c4159
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 14 deletions.
diff --git a/src/appshell/qml/shared/internal/ThemeSample.qml b/src/appshell/qml/shared/internal/ThemeSample.qml
@@ -135,7 +135,10 @@ Rectangle {
     MouseArea {
         id: mouseArea
         anchors.fill: parent
+
+        enabled: root.enabled
         hoverEnabled: true
+
         onClicked: root.clicked()
     }
 }
diff --git a/src/framework/diagnostics/qml/Muse/Diagnostics/DiagnosticNavigationPanel.qml b/src/framework/diagnostics/qml/Muse/Diagnostics/DiagnosticNavigationPanel.qml
@@ -210,6 +210,7 @@ Rectangle {
                             MouseArea {
                                 anchors.fill: parent
 
+                                enabled: gridItem.enabled
                                 hoverEnabled: true
                                 onContainsMouseChanged: {
                                     if (containsMouse) {

diff --git a/src/framework/extensions/qml/Muse/Extensions/internal/ExtensionItem.qml b/src/framework/extensions/qml/Muse/Extensions/internal/ExtensionItem.qml
@@ -135,6 +135,7 @@ Item {
         id: mouseArea
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: {

diff --git a/src/framework/learn/qml/Muse/Learn/internal/PlaylistItem.qml b/src/framework/learn/qml/Muse/Learn/internal/PlaylistItem.qml
@@ -168,9 +168,9 @@ FocusScope {
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: {

diff --git a/src/framework/mpe/qml/Muse/Mpe/ArticulationPatternSegmentsList.qml b/src/framework/mpe/qml/Muse/Mpe/ArticulationPatternSegmentsList.qml
@@ -59,6 +59,7 @@ ListView {
                 id: thumbnailMouseArea
 
                 anchors.fill: parent
+                enabled: thumbnailPlot.enabled
                 hoverEnabled: true
 
                 onClicked: {

diff --git a/src/framework/mpe/qml/Muse/Mpe/ArticulationPatternsList.qml b/src/framework/mpe/qml/Muse/Mpe/ArticulationPatternsList.qml
@@ -84,6 +84,7 @@ ListView {
                     anchors.fill: label
 
                     acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    enabled: label.enabled
                     hoverEnabled: true
 
                     onClicked: function(mouse) {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ColorPicker.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ColorPicker.qml
@@ -81,9 +81,11 @@ Rectangle {
 
     MouseArea {
         id: clickableArea
-
         anchors.fill: parent
+
+        enabled: root.enabled
         hoverEnabled: true
+
         onClicked: {
             navigation.requestActiveByInteraction()
 

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ExpandableBlankSection.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ExpandableBlankSection.qml
@@ -105,9 +105,9 @@ FocusScope {
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: expandSectionRow
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatButton.qml
@@ -296,6 +296,7 @@ FocusScope {
         id: mouseArea
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: function(mouse) {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButton.qml
@@ -55,7 +55,8 @@ RadioDelegate {
     implicitHeight: ListView.view ? ListView.view.height : ui.theme.defaultButtonSize
     implicitWidth: ListView.view ? (ListView.view.width - (ListView.view.spacing * (ListView.view.count - 1))) / ListView.view.count
                                  : ui.theme.defaultButtonSize
-    hoverEnabled: true
+
+    hoverEnabled: root.enabled
 
     onClicked: {
         navigation.requestActiveByInteraction()

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatToggleButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatToggleButton.qml
@@ -82,7 +82,9 @@ FocusScope {
         id: mouseArea
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
+
         onClicked: {
             navigation.requestActiveByInteraction()
             root.toggled()

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ListItemBlank.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ListItemBlank.qml
@@ -59,7 +59,8 @@ FocusableControl {
 
     focusBorder.drawOutsideParent: false
 
-    mouseArea.hoverEnabled: root.visible
+    mouseArea.enabled: root.visible && root.enabled
+    mouseArea.hoverEnabled: true
     mouseArea.onHoveredChanged: root.hovered(mouseArea.containsMouse, mouseArea.mouseX, mouseArea.mouseY)
 
     mouseArea.onClicked: function(mouse) {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/NumberInputField.qml b/src/framework/uicomponents/qml/Muse/UiComponents/NumberInputField.qml
@@ -182,12 +182,10 @@ FocusScope {
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: parent
 
-        hoverEnabled: true
-
         enabled: !textField.readOnly
+        hoverEnabled: true
 
         onPressed: {
             navigation.requestActiveByInteraction()

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/RoundedRadioButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/RoundedRadioButton.qml
@@ -42,7 +42,7 @@ RadioDelegate {
 
     font: ui.theme.bodyFont
 
-    hoverEnabled: true
+    hoverEnabled: root.enabled
 
     onToggled: {
         navigation.requestActiveByInteraction()

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/StyledSlider.qml b/src/framework/uicomponents/qml/Muse/UiComponents/StyledSlider.qml
@@ -32,7 +32,7 @@ Slider {
     implicitWidth: vertical ? prv.handleSize : prv.defaultLength
     implicitHeight: vertical ? prv.defaultLength : prv.handleSize
 
-    hoverEnabled: true
+    hoverEnabled: root.enabled
     wheelEnabled: true
 
     QtObject {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/TextInputArea.qml b/src/framework/uicomponents/qml/Muse/UiComponents/TextInputArea.qml
@@ -226,9 +226,9 @@ FocusScope {
 
     MouseArea {
         id: clickableArea
-
         anchors.fill: parent
 
+        enabled: root.enabled
         propagateComposedEvents: true
         hoverEnabled: true
         cursorShape: Qt.IBeamCursor

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/TextInputField.qml b/src/framework/uicomponents/qml/Muse/UiComponents/TextInputField.qml
@@ -319,6 +319,7 @@ FocusScope {
         height: parent.height
         width: clearTextButtonItem.visible ? parent.width - clearTextButtonItem.width : parent.width
 
+        enabled: root.enabled
         propagateComposedEvents: true
         hoverEnabled: true
         cursorShape: root.readOnly ? Qt.ArrowCursor : Qt.IBeamCursor

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ToggleButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ToggleButton.qml
@@ -100,6 +100,7 @@ FocusScope {
         id: mouseArea
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
         onClicked: {
             navigation.requestActiveByInteraction()

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ValueAdjustControl.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ValueAdjustControl.qml
@@ -65,6 +65,7 @@ Column {
             id: increaseMouseArea
             anchors.fill: parent
 
+            enabled: increaseButton.enabled
             hoverEnabled: true
             preventStealing: true
 
@@ -130,6 +131,7 @@ Column {
             id: decreaseMouseArea
             anchors.fill: parent
 
+            enabled: decreaseButton.enabled
             hoverEnabled: true
             preventStealing: true
 

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/DropdownItem.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/DropdownItem.qml
@@ -81,7 +81,10 @@ Item {
     MouseArea {
         id: mouseAreaItem
         anchors.fill: parent
+
+        enabled: root.enabled
         hoverEnabled: true
+
         onClicked: root.clicked()
 
         onContainsMouseChanged: {

diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/ValueListHeaderItem.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/ValueListHeaderItem.qml
@@ -102,6 +102,8 @@ Item {
     MouseArea {
         id: mouseArea
         anchors.fill: parent
+
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: {

diff --git a/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPadContent.qml b/src/notation/qml/MuseScore/NotationScene/internal/PercussionPanelPadContent.qml
@@ -52,8 +52,9 @@ Column {
 
         MouseArea {
             id: mouseArea
-
             anchors.fill: parent
+
+            enabled: mainContentArea.enabled
             hoverEnabled: true
 
             onPressed: {

diff --git a/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml b/src/playback/qml/MuseScore/Playback/internal/AudioResourceControl.qml
@@ -366,8 +366,9 @@ Item {
 
     MouseArea {
         id: rootMouseArea
-
         anchors.fill: parent
+
+        enabled: parent.enabled
         acceptedButtons: Qt.NoButton
         hoverEnabled: true
     }

diff --git a/src/playback/qml/MuseScore/Playback/internal/MixerTitleSection.qml b/src/playback/qml/MuseScore/Playback/internal/MixerTitleSection.qml
@@ -79,6 +79,7 @@ MixerPanelSection {
             id: mouseArea
             anchors.fill: parent
 
+            enabled: parent.enabled
             hoverEnabled: true
 
             onContainsMouseChanged: {

diff --git a/src/project/qml/MuseScore/Project/internal/ScoresPage/CloudScoreIndicatorButton.qml b/src/project/qml/MuseScore/Project/internal/ScoresPage/CloudScoreIndicatorButton.qml
@@ -154,6 +154,7 @@ Item {
         id: mouseArea
         anchors.fill: root
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onContainsMouseChanged: {

diff --git a/src/project/qml/MuseScore/Project/internal/ScoresPage/ScoreGridItem.qml b/src/project/qml/MuseScore/Project/internal/ScoresPage/ScoreGridItem.qml
@@ -63,9 +63,9 @@ FocusScope {
 
     MouseArea {
         id: mouseArea
-
         anchors.fill: parent
 
+        enabled: root.enabled
         hoverEnabled: true
 
         onClicked: {