From a874087504cf5af8bb4171d4137f23f100b7063b Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 1 Dec 2022 22:15:02 +0100
Subject: QComboBox: hide the popup on keypress rather than ShortcutOverride
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Qt sends a ShortcutOverride to the focus widget to evaluate whether the
widget's key event handling has higher priority than shortcut handling.
A KeyPress is then sent if the ShortcutOverride comes back accepted, or
if the Shortcut event returns ignored.

QComboBox needs to accept the ShortcutOverride for Cancel, so that
hiding the popup has priority over application shortcuts. But it should
only hide the popup when the KeyPress event actually arrives, as
otherwise the the focus widget changes (from popup to combobox), which
breaks event delivery on macOS.

Fixes: QTBUG-108908
Pick-to: 6.4 6.4.2
Change-Id: Ie9cce1c2041cbe0e41be301686d7c3b5683e9f10
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/widgets/widgets/qcombobox.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/widgets/widgets/qcombobox.cpp')

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 331764efa8..5889545b1c 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -728,7 +728,8 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
         default:
 #if QT_CONFIG(shortcut)
             if (keyEvent->matches(QKeySequence::Cancel)) {
-                combo->hidePopup();
+                closeOnCancel = true;
+                keyEvent->accept();
                 return true;
             }
 #endif
@@ -775,6 +776,7 @@ bool QComboBoxPrivateContainer::eventFilter(QObject *o, QEvent *e)
 
 void QComboBoxPrivateContainer::showEvent(QShowEvent *)
 {
+    closeOnCancel = true;
     combo->update();
 }
 
@@ -3216,6 +3218,12 @@ void QComboBox::keyPressEvent(QKeyEvent *e)
         break;
 #endif
     default:
+        if (e->matches(QKeySequence::Cancel) && (!d->container || d->container->closeOnCancel)) {
+            hidePopup();
+            e->accept();
+            d->container->closeOnCancel = false;
+        }
+
         if (!d->lineEdit) {
             if (!e->text().isEmpty())
                 d->keyboardSearchString(e->text());
-- 
cgit v1.2.3