Fix NavigationPanels for toolbars from non-active pages being enabled

iveshenry18 · Jul 5, 2021 · 1985e58 · 1985e58
1 parent 9d28d4a
commit 1985e58
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/src/appshell/qml/MainToolBar.qml b/src/appshell/qml/MainToolBar.qml
@@ -35,7 +35,7 @@ Rectangle {
 
     property alias navigation: keynavSub
 
-    property var currentUri: "musescore://home"
+    property string currentUri: "musescore://home"
     property var items: [
         {
             title: qsTrc("appshell", "Home"),
@@ -64,6 +64,7 @@ Rectangle {
     NavigationPanel {
         id: keynavSub
         name: "MainToolBar"
+        enabled: root.enabled && root.visible
         accessible.name: qsTrc("appshell", "Main tool bar") + " " + keynavSub.directionInfo
     }
 

diff --git a/src/appshell/qml/PublishPage/PublishPage.qml b/src/appshell/qml/PublishPage/PublishPage.qml
@@ -59,6 +59,7 @@ DockPage {
             minimumWidth: 198
 
             contentComponent: NotationToolBar {
+                navigation.section: root.topToolKeyNavSec
                 navigation.order: 2
 
                 onActiveFocusRequested: {

diff --git a/src/appshell/qml/PublishPage/PublishToolBar.qml b/src/appshell/qml/PublishPage/PublishToolBar.qml
@@ -34,8 +34,8 @@ Rectangle {
 
     NavigationPanel {
         id: keynavSub
-
         name: "PublishToolBar"
+        enabled: root.enabled && root.visible
     }
 
     PublishToolBarModel {

diff --git a/src/notation/qml/MuseScore/NotationScene/NotationToolBar.qml b/src/notation/qml/MuseScore/NotationScene/NotationToolBar.qml
@@ -40,6 +40,7 @@ Rectangle {
     NavigationPanel {
         id: keynavSub
         name: "NotationToolBar"
+        enabled: root.enabled && root.visible
         onActiveChanged: {
             if (active) {
                 root.activeFocusRequested()

diff --git a/src/notation/qml/MuseScore/NotationScene/NoteInputBar.qml b/src/notation/qml/MuseScore/NotationScene/NoteInputBar.qml
@@ -38,12 +38,13 @@ Rectangle {
     QtObject {
         id: privatesProperties
 
-        property bool isHorizontal: orientation === Qt.Horizontal
+        property bool isHorizontal: root.orientation === Qt.Horizontal
     }
 
     NavigationPanel {
         id: keynavSub
         name: "NoteInputBar"
+        enabled: root.enabled && root.visible
     }
 
     NoteInputBarModel {

diff --git a/src/notation/qml/MuseScore/NotationScene/UndoRedoToolBar.qml b/src/notation/qml/MuseScore/NotationScene/UndoRedoToolBar.qml
@@ -39,6 +39,7 @@ Rectangle {
     NavigationPanel {
         id: navPanel
         name: "UndoRedoToolBar"
+        enabled: root.enabled && root.visible
     }
 
     UndoRedoModel {

diff --git a/src/playback/qml/MuseScore/Playback/PlaybackToolBar.qml b/src/playback/qml/MuseScore/Playback/PlaybackToolBar.qml
@@ -33,14 +33,15 @@ import "internal"
 Rectangle {
     id: root
 
-    property alias navigation: keynavSub
+    property alias navigation: navPanel
     property bool floating: false
 
     color: ui.theme.backgroundPrimaryColor
 
     NavigationPanel {
-        id: keynavSub
+        id: navPanel
         name: "PlaybackToolBar"
+        enabled: root.enabled && root.visible
     }
 
     PlaybackToolBarModel {
@@ -94,7 +95,7 @@ Rectangle {
                         FlatButton {
                             id: btn
                             property var modelData
-                            property var hasSubitems: modelData.subitems.length !== 0
+                            property bool hasSubitems: modelData.subitems.length !== 0
 
                             icon: modelData.icon
 
@@ -108,7 +109,7 @@ Rectangle {
                                               ? ui.theme.accentColor : "transparent"
                             accentButton: modelData.checked || menuLoader.isMenuOpened
 
-                            navigation.panel: keynavSub
+                            navigation.panel: navPanel
                             navigation.name: modelData.title
                             navigation.order: modelData.index
                             navigation.enabled: playbackModel.isPlayAllowed