From 47c63deb6fe5710f28fdeb3c678eb7ac480c66cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Tue, 30 Apr 2013 02:59:02 +0200
Subject: [PATCH] elegantly work around the hack

---
 src/declarativeimports/core/dialog.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp
index 693792a88..692899e65 100644
--- a/src/declarativeimports/core/dialog.cpp
+++ b/src/declarativeimports/core/dialog.cpp
@@ -151,12 +151,8 @@ void DialogProxy::setVisible(const bool visible)
     QRect avail;
     if (visible) {
         syncToMainItemSize();
-        if (!m_visualParent.isNull()) {
-            if (m_visualParent.data()->window()) {
-                avail = m_visualParent.data()->window()->screen()->availableGeometry();
-            } else {
-                avail = QRect(m_visualParent.data()->x(), m_visualParent.data()->y(), m_visualParent.data()->width(), m_visualParent.data()->height());
-            }
+        if (!m_visualParent.isNull() && m_visualParent.data()->window()) {
+            avail = m_visualParent.data()->window()->screen()->availableGeometry();
             if (location() == Plasma::FullScreen) {
                 m_frameSvgItem->setEnabledBorders(Plasma::FrameSvg::NoBorder);
                 setGeometry(avail);
@@ -183,7 +179,7 @@ void DialogProxy::setVisible(const bool visible)
                 setPosition(popupPosition(m_visualParent.data(), Qt::AlignCenter));
             }
         } else {
-            // no visual parent -> center on screen
+            // no visual parent or window -> center on screen
             setPosition((avail.width() - width()) / 2, (avail.height() - height()) / 2);
         }
         raise();