diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-19 17:10:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-19 16:17:50 +0000 |
| commit | 3594d68979137753bcfeb37ae0a962661ffd5284 (patch) | |
| tree | f178bb9f13ea80bf28cc8f7784e5019fe3691540 /src/plugins/coreplugin/outputpanemanager.cpp | |
| parent | 89e418ef7060537659e2fe804050cbb5d3f1eb27 (diff) | |
| download | qt-creator-3594d68979137753bcfeb37ae0a962661ffd5284.tar.gz | |
Raise main window when opening output panes with focus request.
Also do that if the output pane doesn't want the focus. The user still
wants to see the output pane even if the main window is not the current
window.
Change-Id: I341543be53082adec4fade4ffa859ca7c74d3dae
Task-number: QTCREATORBUG-13088
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/outputpanemanager.cpp')
| -rw-r--r-- | src/plugins/coreplugin/outputpanemanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp index e77fa29dd8..fa2672713e 100644 --- a/src/plugins/coreplugin/outputpanemanager.cpp +++ b/src/plugins/coreplugin/outputpanemanager.cpp @@ -494,8 +494,9 @@ void OutputPaneManager::showPage(int idx, int flags) ensurePageVisible(idx); IOutputPane *out = m_panes.at(idx); out->visibilityChanged(true); - if (flags & IOutputPane::WithFocus && out->canFocus()) { - out->setFocus(); + if (flags & IOutputPane::WithFocus) { + if (out->canFocus()) + out->setFocus(); ICore::raiseWindow(m_outputWidgetPane); } |