diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-01 10:21:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-01 19:20:20 +0200 |
| commit | 57fccd6f2156e097fb902789a61731905487c543 (patch) | |
| tree | d0114319e7016538d0ca4ffca2e77beb312b38e5 /src/widgets | |
| parent | 8f4baa3a223ad6f12101d5c4c10756a98d340ae6 (diff) | |
| parent | d25c3227299a6a281db37e68e45f0b02db3f5297 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qshortcut.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp index c7b9f3ec7a..c418db14ff 100644 --- a/src/widgets/kernel/qshortcut.cpp +++ b/src/widgets/kernel/qshortcut.cpp @@ -189,10 +189,15 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge } #endif - /* if a floating tool window is active, keep shortcuts on the - * parent working */ - if (active_window != tlw && active_window && active_window->windowType() == Qt::Tool && active_window->parentWidget()) { - active_window = active_window->parentWidget()->window(); + if (active_window && active_window != tlw) { + /* if a floating tool window is active, keep shortcuts on the parent working. + * and if a popup window is active (f.ex a completer), keep shortcuts on the + * focus proxy working */ + if (active_window->windowType() == Qt::Tool && active_window->parentWidget()) { + active_window = active_window->parentWidget()->window(); + } else if (active_window->windowType() == Qt::Popup && active_window->focusProxy()) { + active_window = active_window->focusProxy()->window(); + } } if (active_window != tlw) { |