aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates/qquickmenubar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quicktemplates/qquickmenubar.cpp')
-rw-r--r--src/quicktemplates/qquickmenubar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quicktemplates/qquickmenubar.cpp b/src/quicktemplates/qquickmenubar.cpp
index d8ecbb6626..62c7680d0d 100644
--- a/src/quicktemplates/qquickmenubar.cpp
+++ b/src/quicktemplates/qquickmenubar.cpp
@@ -171,7 +171,7 @@ void QQuickMenuBarPrivate::onItemTriggered()
void QQuickMenuBarPrivate::onMenuAboutToHide()
{
- if (triggering || !currentItem || (currentItem->isHovered() && currentItem->isEnabled()) || !currentItem->isHighlighted())
+ if (triggering || !currentItem || !currentItem->isHighlighted())
return;
popupMode = false;
@@ -502,6 +502,7 @@ void QQuickMenuBar::keyPressEvent(QKeyEvent *event)
else
d->activatePreviousItem();
break;
+ // This is triggered when no popup is open but a menu bar item is highlighted and has focus.
case Qt::Key_Escape:
if (d->currentItem) {
d->activateItem(nullptr);