17207: Alt+F4 to close a dialog should not activate the top menu

musescore · Feb 5, 2025 · e3e61e5 · e3e61e5
1 parent fbf69d9
commit e3e61e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/appshell/view/navigableappmenumodel.cpp b/src/appshell/view/navigableappmenumodel.cpp
@@ -306,25 +306,23 @@ bool NavigableAppMenuModel::processEventForAppMenu(QEvent* event)
             break;
         }
 
+        m_needActivateHighlight = false;
+
         if (isNavigationStarted && isNavigateKey(key)) {
             navigate(key);
-            m_needActivateHighlight = false;
 
             event->accept();
             return true;
         } else if (isNavigationWithSymbol || isNavigationWithAlt) {
             QSet<int> activatePossibleKeys = possibleKeys(keyEvent);
             if (hasItem(activatePossibleKeys)) {
                 navigate(activatePossibleKeys);
-                m_needActivateHighlight = true;
 
                 event->accept();
                 return true;
             }
         }
 
-        m_needActivateHighlight = false;
-
         break;
     }
     case QEvent::KeyRelease: {
@@ -337,10 +335,9 @@ bool NavigableAppMenuModel::processEventForAppMenu(QEvent* event)
             restoreMUNavigationSystemState();
         } else {
             if (m_needActivateHighlight) {
+                m_needActivateHighlight = false;
                 saveMUNavigationSystemState();
                 navigateToFirstMenu();
-            } else {
-                m_needActivateHighlight = true;
             }
         }
 
@@ -465,6 +462,7 @@ void NavigableAppMenuModel::navigateToSubItem(const QString& menuId, const QSet<
 void NavigableAppMenuModel::resetNavigation()
 {
     setHighlightedMenuId("");
+    m_needActivateHighlight = false;
 }
 
 void NavigableAppMenuModel::navigateToFirstMenu()

diff --git a/src/appshell/view/navigableappmenumodel.h b/src/appshell/view/navigableappmenumodel.h
@@ -111,7 +111,7 @@ public slots:
     QString m_highlightedMenuId;
     QString m_openedMenuId;
 
-    bool m_needActivateHighlight = true;
+    bool m_needActivateHighlight = false;
     std::optional<MUNavigationSystemState> m_lastActiveMUNavigationState;
     bool m_needActivateLastMUNavigationControl = false;