From a4f9cf23444dd76a11d4eb67c4ea65d5c3948894 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 29 Jul 2017 11:28:13 +0200
Subject: [PATCH] Disable window shortcuts if there is a window modal dialog

If a window is blocked by a WindowModal dialog, it should not be
possible to trigger window shortcuts on that window if it receives
a WindowActivate event.

This currently happens if the blocked window gets clicked, because the
window becomes the active_window and then QApplication sends it a
WindowActivate event (this doesn't happen with application modal dialogs).

The correctWidgetContext() function calls QApplicationPrivate::tryModalHelper()
only if the shortcut context is ApplicationShortcut. This patch makes it
call even if the shortcut context is WindowShortcut.

Change-Id: Iff87d85bcae603a6a24128e0cedfa9d33b6485fd
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
---
 src/widgets/kernel/qshortcut.cpp              |  2 +-
 .../widgets/kernel/qaction/tst_qaction.cpp    | 52 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index f944a7097b..32600d4152 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -205,7 +205,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
 #if defined(DEBUG_QSHORTCUTMAP)
     qDebug().nospace() << "..true [Pass-through]";
 #endif
-    return true;
+    return QApplicationPrivate::tryModalHelper(w, nullptr);
 }
 
 #if QT_CONFIG(graphicsview)
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 3535e465b3..88ddb7c11d 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -26,7 +26,8 @@
 **
 ****************************************************************************/
 
-
+#include <QDialog>
+#include <QMainWindow>
 #include <QtTest/QtTest>
 
 #include <qapplication.h>
@@ -63,6 +64,8 @@ private slots:
     void task229128TriggeredSignalWhenInActiongroup();
     void repeat();
     void setData();
+    void disableShortcutsWithBlockedWidgets_data();
+    void disableShortcutsWithBlockedWidgets();
 
 private:
     int m_lastEventType;
@@ -424,5 +427,52 @@ void tst_QAction::setData() // QTBUG-62006
     QCOMPARE(spy.count(), 1);
 }
 
+void tst_QAction::disableShortcutsWithBlockedWidgets_data()
+{
+    QTest::addColumn<Qt::ShortcutContext>("shortcutContext");
+    QTest::addColumn<Qt::WindowModality>("windowModality");
+
+    QTest::newRow("application modal dialog should block window shortcut.")
+        << Qt::WindowShortcut << Qt::ApplicationModal;
+
+    QTest::newRow("application modal dialog should block application shortcut.")
+        << Qt::ApplicationShortcut << Qt::ApplicationModal;
+
+    QTest::newRow("window modal dialog should block application shortcut.")
+        << Qt::ApplicationShortcut << Qt::WindowModal;
+
+    QTest::newRow("window modal dialog should block window shortcut.")
+        << Qt::WindowShortcut << Qt::WindowModal;
+}
+
+
+void tst_QAction::disableShortcutsWithBlockedWidgets()
+{
+    QMainWindow window;
+
+    QFETCH(Qt::ShortcutContext, shortcutContext);
+    QAction action(&window);
+    window.addAction(&action);
+    action.setShortcut(QKeySequence(Qt::Key_1));
+    action.setShortcutContext(shortcutContext);
+
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+
+    QDialog dialog(&window);
+    QFETCH(Qt::WindowModality, windowModality);
+    dialog.setWindowModality(windowModality);
+
+    dialog.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&dialog));
+
+    QApplication::setActiveWindow(&window);
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+
+    QSignalSpy spy(&action, &QAction::triggered);
+    QTest::keyPress(&window, Qt::Key_1);
+    QCOMPARE(spy.count(), 0);
+}
+
 QTEST_MAIN(tst_QAction)
 #include "tst_qaction.moc"