Finish the rest of the changes from the geometry positioning

Summary:
Commit d7c230ab19 changes the window to
fill the screen.

However it left dead code in shutdown dialog which was also
repositioning it - and worse...positioning it in a different place
which is just a mess.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D2619

ksmserver/shutdowndlg.cpp

@@ -89,6 +89,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWindow* parent,
     setColor(QColor(Qt::transparent));
     setFlags(Qt::FramelessWindowHint | Qt::BypassWindowManagerHint);
 
+    setResizeMode(QQuickView::SizeRootObjectToView);
 
     // Qt doesn't set this on unmanaged windows
     //FIXME: or does it?
@@ -175,8 +176,6 @@ void KSMShutdownDlg::init()
         return;
     }
 
-    rePosition();
-
     if(!errors().isEmpty()) {
         qWarning() << errors();
     }
@@ -190,7 +189,7 @@ void KSMShutdownDlg::init()
     connect(rootObject(), SIGNAL(lockScreenRequested()), SLOT(slotLockScreen()));
 
     connect(screen(), &QScreen::geometryChanged, this, [this] {
-        rootContext()->setContextProperty(QStringLiteral("screenGeometry"), this->screen()->geometry());
+        setGeometry(screen()->geometry());
     });
 
     QQuickView::show();
@@ -212,8 +211,6 @@ void KSMShutdownDlg::resizeEvent(QResizeEvent *e)
     } else {
 //        setMask(m_view->mask());
     }
-
-    rePosition();
 }
 
 bool KSMShutdownDlg::event(QEvent *e)
@@ -255,15 +252,6 @@ void KSMShutdownDlg::setupWaylandIntegration()
     m_shellSurface->setPosition(geometry().topLeft());
 }
 
-void KSMShutdownDlg::rePosition()
-{
-    setPosition(screen()->geometry().center().x() - width() / 2,
-                screen()->geometry().center().y() - height() / 2);
-    if (m_shellSurface) {
-        m_shellSurface->setPosition(geometry().topLeft());
-    }
-}
-
 void KSMShutdownDlg::slotLogout()
 {
     m_shutdownType = KWorkSpace::ShutdownTypeNone;

ksmserver/shutdowndlg.h

@@ -86,7 +86,6 @@ protected:
     bool event(QEvent *e) override;
 
 private:
-    void rePosition();
     void setupWaylandIntegration();
     KWorkSpace::ShutdownType m_shutdownType;
     QString m_bootOption;