Merge pull request #26044 from Eism/dynamics_popup_nav_fix

DmitryArefiev · web-flow · commit fcdafac42bc2 · 2025-01-15T23:37:43.000+02:00
Dynamics popup navigation fix
diff --git a/src/appshell/qml/NotationPage/NotationPage.qml b/src/appshell/qml/NotationPage/NotationPage.qml
@@ -569,7 +569,7 @@ DockPage {
         Component.onCompleted: {
             root.notationView = notationView.paintView
 
-            root.setDefaultNavigationControl(root.defaultNavigationControl)
+            root.setDefaultNavigationControl(notationView.defaultNavigationControl)
         }
 
         Component.onDestruction: {
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/CapoPopup.qml b/src/notation/qml/MuseScore/NotationScene/internal/CapoPopup.qml
@@ -75,6 +75,12 @@ StyledPopupView {
             name: "CapoSettings"
             direction: NavigationPanel.Vertical
             accessible.name: qsTrc("notation", "Capo settings")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
         }
 
         StyledTextLabel {
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/DynamicPopup.qml b/src/notation/qml/MuseScore/NotationScene/internal/DynamicPopup.qml
@@ -51,10 +51,40 @@ StyledPopupView {
         NavigationPanel {
             id: dynamicsNavPanel
             name: "DynamicsPopup"
-            direction: NavigationPanel.Vertical
+            direction: NavigationPanel.Horizontal
             section: root.notationViewNavigationSection
             order: root.navigationOrderStart
             accessible.name: qsTrc("notation", "Dynamics Popup")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
+        }
+
+        function goToPreviousPage() {
+            if (currentPage > 0) {
+                currentPage--
+            } else {
+                currentPage = dynamicModel.pages.length - 1
+            }
+
+            Qt.callLater(requestNavigationActive, dynamicRepeater.count - 1)
+        }
+
+        function goToNextPage() {
+            if (currentPage < dynamicModel.pages.length - 1) {
+                currentPage++
+            } else {
+                currentPage = 0
+            }
+
+            Qt.callLater(requestNavigationActive, 0)
+        }
+
+        function requestNavigationActive(index) {
+            dynamicRepeater.itemAt(index).navigation.requestActive()
         }
 
         FlatButton {
@@ -70,11 +100,7 @@ StyledPopupView {
             }
 
             onClicked: {
-                if (currentPage > 0) {
-                    currentPage--
-                } else {
-                    currentPage = dynamicModel.pages.length - 1
-                }
+                content.goToPreviousPage()
             }
         }
 
@@ -84,6 +110,7 @@ StyledPopupView {
 
         Repeater {
             id: dynamicRepeater
+
             model: dynamicModel.pages[currentPage]
 
             delegate: FlatButton {
@@ -97,6 +124,35 @@ StyledPopupView {
                                 modelData.type === DynamicPopupModel.Crescendo ? crescHairpinComp :
                                 modelData.type === DynamicPopupModel.Decrescendo ? dimHairpinComp : null
 
+                navigation.panel: dynamicsNavPanel
+                navigation.order: index
+                accessible.name: modelData.accessibleName
+                navigation.onNavigationEvent: function(event) {
+                    switch (event.type) {
+                    case NavigationEvent.Up:
+                    case NavigationEvent.Left: {
+                        if (index == 0) {
+                            content.goToPreviousPage()
+
+                            event.accepted = true
+                        }
+
+                        break
+                    }
+
+                    case NavigationEvent.Right:
+                    case NavigationEvent.Down: {
+                        if (index == dynamicRepeater.count - 1) {
+                            content.goToNextPage()
+
+                            event.accepted = true
+                        }
+
+                        break
+                    }
+                    }
+                }
+
                 Component {
                     id: dynamicComp
 
@@ -191,11 +247,7 @@ StyledPopupView {
             }
 
             onClicked: {
-                if (currentPage < dynamicModel.pages.length - 1) {
-                    currentPage++
-                } else {
-                    currentPage = 0
-                }
+                content.goToNextPage()
             }
         }
     }
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/HarpPedalPopup.qml b/src/notation/qml/MuseScore/NotationScene/internal/HarpPedalPopup.qml
@@ -122,6 +122,12 @@ StyledPopupView {
             name: "PedalSettings"
             direction: NavigationPanel.Vertical
             accessible.name: qsTrc("notation", "Pedal settings buttons")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
         }
 
         // Accidental symbols
@@ -266,6 +272,12 @@ StyledPopupView {
             direction: NavigationPanel.Horizontal
             order: pedalSettingsNavPanel.order + 1
             accessible.name: qsTrc("notation", "Diagram type buttons")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
         }
 
         RoundedRadioButton {
diff --git a/src/notation/qml/MuseScore/NotationScene/internal/StringTuningsPopup.qml b/src/notation/qml/MuseScore/NotationScene/internal/StringTuningsPopup.qml
@@ -75,6 +75,12 @@ StyledPopupView {
             section: root.notationViewNavigationSection
             order: root.navigationOrderStart
             accessible.name: qsTrc("notation", "String tunings settings")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
         }
 
         StyledTextLabel {
@@ -135,6 +141,12 @@ StyledPopupView {
             section: root.notationViewNavigationSection
             order: navPanel.order + 1
             accessible.name: qsTrc("notation", "Strings")
+
+            onNavigationEvent: function(event) {
+                if (event.type === NavigationEvent.Escape) {
+                    root.close()
+                }
+            }
         }
 
         GridLayout {
diff --git a/src/notation/view/internal/dynamicpopupmodel.cpp b/src/notation/view/internal/dynamicpopupmodel.cpp
@@ -25,6 +25,7 @@
 #include "engraving/dom/dynamic.h"
 #include "engraving/dom/factory.h"
 #include "engraving/types/symnames.h"
+#include "engraving/types/typesconv.h"
 
 #include "log.h"
 
@@ -136,6 +137,7 @@ void DynamicPopupModel::init()
         for (const DynamicPopupModel::PageItem& item : page) {
             QVariantMap variantMap {
                 { "text", xmlTextToQString(Dynamic::dynamicText(item.dynType).toStdString(), engravingFont) },
+                { "accessibleName", TConv::userName(item.dynType).translated().toQString() },
                 { "width", item.width },
                 { "offset", item.offset },
                 { "type", item.itemType }
diff --git a/src/playback/qml/MuseScore/Playback/SoundFlagPopup.qml b/src/playback/qml/MuseScore/Playback/SoundFlagPopup.qml
@@ -90,6 +90,12 @@ StyledPopupView {
                 section: root.notationViewNavigationSection
                 order: root.navigationOrderStart
                 accessible.name: qsTrc("playback", "Sound flag settings")
+
+                onNavigationEvent: function(event) {
+                    if (event.type === NavigationEvent.Escape) {
+                        root.close()
+                    }
+                }
             }
 
             StyledIconLabel {
@@ -155,6 +161,10 @@ StyledPopupView {
 
             navigationPanelSection: root.notationViewNavigationSection
             navigationPanelOrderStart: navPanel.order + 1
+
+            onCloseRequested: {
+                root.close()
+            }
         }
     }
 }
diff --git a/src/playback/qml/MuseScore/Playback/internal/SoundFlag/MuseSoundsParams.qml b/src/playback/qml/MuseScore/Playback/internal/SoundFlag/MuseSoundsParams.qml
@@ -38,6 +38,8 @@ Item {
 
     height: !noOptions ? content.childrenRect.height : noOptionsLabel.implicitHeight
 
+    signal closeRequested()
+
     Column {
         id: content
 
@@ -66,6 +68,10 @@ Item {
             onToggleParamRequested: {
                 root.model.togglePreset(paramCode)
             }
+
+            onCloseRequested: {
+                root.closeRequested()
+            }
         }
 
         ParamsGridView {
@@ -89,6 +95,10 @@ Item {
             onToggleParamRequested: {
                 root.model.togglePlayingTechnique(paramCode)
             }
+
+            onCloseRequested: {
+                root.closeRequested()
+            }
         }
     }
 
diff --git a/src/playback/qml/MuseScore/Playback/internal/SoundFlag/ParamsGridView.qml b/src/playback/qml/MuseScore/Playback/internal/SoundFlag/ParamsGridView.qml
@@ -42,9 +42,16 @@ Column {
         name: "SoundFlagParams" + title
         direction: NavigationPanel.Vertical
         accessible.name: title
+
+        onNavigationEvent: function(event) {
+            if (event.type === NavigationEvent.Escape) {
+                root.closeRequested()
+            }
+        }
     }
 
     signal toggleParamRequested(string paramCode)
+    signal closeRequested()
 
     spacing: 8
 

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ DockPage {`
`569`	`569`	`Component.onCompleted: {`
`570`	`570`	`root.notationView = notationView.paintView`
`571`	`571`
`572`		`- root.setDefaultNavigationControl(root.defaultNavigationControl)`
	`572`	`+ root.setDefaultNavigationControl(notationView.defaultNavigationControl)`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`Component.onDestruction: {`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,12 @@ StyledPopupView {`
`90`	`90`	`section: root.notationViewNavigationSection`
`91`	`91`	`order: root.navigationOrderStart`
`92`	`92`	`accessible.name: qsTrc("playback", "Sound flag settings")`
	`93`	`+`
	`94`	`+ onNavigationEvent: function(event) {`
	`95`	`+ if (event.type === NavigationEvent.Escape) {`
	`96`	`+ root.close()`
	`97`	`+ }`
	`98`	`+ }`
`93`	`99`	`}`
`94`	`100`
`95`	`101`	`StyledIconLabel {`
`@@ -155,6 +161,10 @@ StyledPopupView {`
`155`	`161`
`156`	`162`	`navigationPanelSection: root.notationViewNavigationSection`
`157`	`163`	`navigationPanelOrderStart: navPanel.order + 1`
	`164`	`+`
	`165`	`+ onCloseRequested: {`
	`166`	`+ root.close()`
	`167`	`+ }`
`158`	`168`	`}`
`159`	`169`	`}`
`160`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ Item {`
`38`	`38`
`39`	`39`	`height: !noOptions ? content.childrenRect.height : noOptionsLabel.implicitHeight`
`40`	`40`
	`41`	`+ signal closeRequested()`
	`42`	`+`
`41`	`43`	`Column {`
`42`	`44`	`id: content`
`43`	`45`
`@@ -66,6 +68,10 @@ Item {`
`66`	`68`	`onToggleParamRequested: {`
`67`	`69`	`root.model.togglePreset(paramCode)`
`68`	`70`	`}`
	`71`	`+`
	`72`	`+ onCloseRequested: {`
	`73`	`+ root.closeRequested()`
	`74`	`+ }`
`69`	`75`	`}`
`70`	`76`
`71`	`77`	`ParamsGridView {`
`@@ -89,6 +95,10 @@ Item {`
`89`	`95`	`onToggleParamRequested: {`
`90`	`96`	`root.model.togglePlayingTechnique(paramCode)`
`91`	`97`	`}`
	`98`	`+`
	`99`	`+ onCloseRequested: {`
	`100`	`+ root.closeRequested()`
	`101`	`+ }`
`92`	`102`	`}`
`93`	`103`	`}`
`94`	`104`