diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 952ec3911..c0bcf8ea3 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/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; diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index e39759aec..de8a60c85 100644 --- a/ksmserver/shutdowndlg.h +++ b/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;