From 4a788eb8313d7c089e3a59594fc6a5c9a7dd6499 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Oct 2011 15:45:25 +0200 Subject: QWindow: Re-create platform window only if screen actually changes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3b7dd8b1307aa3cc9357dca861ea407644c5a2e9 Reviewed-by: Samuel Rødal --- src/gui/kernel/qwindow.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 80666b87d2..c2a698ef9b 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -645,12 +645,16 @@ QScreen *QWindow::screen() const void QWindow::setScreen(QScreen *newScreen) { Q_D(QWindow); - bool wasCreated = d->platformWindow != 0; - if (wasCreated) - destroy(); - d->screen = newScreen ? newScreen : QGuiApplication::primaryScreen(); - if (wasCreated) - create(); + if (!newScreen) + newScreen = QGuiApplication::primaryScreen(); + if (newScreen != screen()) { + const bool wasCreated = d->platformWindow != 0; + if (wasCreated) + destroy(); + d->screen = newScreen; + if (wasCreated) + create(); + } } /*! -- cgit v1.2.3