From 54aff55202699b19e06a9bd9b316a879573640ee Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 6 Aug 2010 10:09:14 +0200
Subject: [PATCH] Design mode: Position editor popup (Ctrl-Tab) correctly.
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Task-number: QTCREATORBUG-2002
(cherry picked from commit 9bad0c01bec3547324bf9340497fb956467a9531)
---
src/plugins/coreplugin/editormanager/editormanager.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index a296741aa05..bd3e07c67a0 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);
--
GitLab