summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-08-06 10:09:14 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-08-06 10:09:14 +0200
commit9bad0c01bec3547324bf9340497fb956467a9531 (patch)
tree4a6aa51db361f0244eba9d6187b6bda8403312af
parent111b89d7553fc1b3fdba4e7f4d4ec30f60c03c32 (diff)
downloadqt-creator-9bad0c01bec3547324bf9340497fb956467a9531.tar.gz
Design mode: Position editor popup (Ctrl-Tab) correctly.
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-2002
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index a296741aa0..bd3e07c67a 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1628,7 +1628,10 @@ void EditorManager::showPopupOrSelectDocument() const
if (QApplication::keyboardModifiers() == Qt::NoModifier) {
windowPopup()->selectAndHide();
} else {
- const QPoint p(mapToGlobal(QPoint(0, 0)));
+ // EditorManager is invisible when invoked from Design Mode.
+ const QPoint p = isVisible() ?
+ mapToGlobal(QPoint(0, 0)) :
+ m_d->m_core->mainWindow()->mapToGlobal(QPoint(0, 0));
windowPopup()->move((width()-m_d->m_windowPopup->width())/2 + p.x(),
(height()-m_d->m_windowPopup->height())/2 + p.y());
windowPopup()->setVisible(true);