diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-22 17:25:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-25 07:14:57 +0000 |
| commit | 44ddca544caa61f290d502fdf62f5bdbaf2b4f34 (patch) | |
| tree | 599aea6da879b9595c72d80bbe9d105a5cbaee8d /src/plugins | |
| parent | bf698f5a2f8495158a218a310ba0d901629860fd (diff) | |
| download | qt-creator-44ddca544caa61f290d502fdf62f5bdbaf2b4f34.tar.gz | |
Fix focusing of already open output pane from separate window
If the focus is in a separate window and the shortcut for an already
open output pane is triggered, we should set the focus there and
activate the window, not close the output pane.
Fixes: QTCREATORBUG-20083
Change-Id: Ia9f9fbe137c9ac1ad3e9d148cc410ca093275916
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/coreplugin/outputpanemanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index 31af49521f..0020129382 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -513,7 +513,8 @@ void OutputPaneManager::shortcutTriggered(int idx) // then just give it focus. int current = currentIndex(); if (OutputPanePlaceHolder::isCurrentVisible() && current == idx) { - if (!outputPane->hasFocus() && outputPane->canFocus()) { + if ((!m_outputWidgetPane->isActiveWindow() || !outputPane->hasFocus()) + && outputPane->canFocus()) { outputPane->setFocus(); ICore::raiseWindow(m_outputWidgetPane); } else { |