From 19e4d883f301a541dcfe97971fc6795734f2849c Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Sat, 31 Oct 2015 02:35:11 +0100 Subject: [PATCH] Don't duplicate code for setting the screen geometry --- shell/desktopview.cpp | 15 +++++++-------- shell/desktopview.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp index 824870f31..6d2c6563d 100644 --- a/shell/desktopview.cpp +++ b/shell/desktopview.cpp @@ -94,10 +94,7 @@ void DesktopView::adaptToScreen() } // qDebug() << "adapting to screen" << screen()->name() << this; if ((m_windowType == Desktop || m_windowType == WindowedDesktop) && !ShellManager::s_forceWindowed) { - setGeometry(screen()->geometry()); - setMinimumSize(screen()->geometry().size()); - setMaximumSize(screen()->geometry().size()); - + screenGeometryChanged(); if(m_oldScreen) { disconnect(m_oldScreen.data(), &QScreen::geometryChanged, this, &DesktopView::screenGeometryChanged); @@ -256,11 +253,13 @@ void DesktopView::showConfigurationInterface(Plasma::Applet *applet) m_configView.data()->show(); } -void DesktopView::screenGeometryChanged(const QRect &geom) +void DesktopView::screenGeometryChanged() { - setGeometry(screen()->geometry()); - setMinimumSize(screen()->geometry().size()); - setMaximumSize(screen()->geometry().size()); + const QRect geo = screen()->geometry(); +// qDebug() << "newGeometry" << this << geo << geometry(); + setGeometry(geo); + setMinimumSize(geo.size()); + setMaximumSize(geo.size()); } diff --git a/shell/desktopview.h b/shell/desktopview.h index 867cfdc25..6a4d42ccc 100644 --- a/shell/desktopview.h +++ b/shell/desktopview.h @@ -77,7 +77,7 @@ protected Q_SLOTS: virtual void showConfigurationInterface(Plasma::Applet *applet); private Q_SLOTS: - void screenGeometryChanged(const QRect &geom); + void screenGeometryChanged(); Q_SIGNALS: void stayBehindChanged();