From 3f60bd305ad3b094356750c21e253704bbe62681 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 4 Jul 2014 10:39:19 +0200 Subject: Add convenience function for checking screen changes to QPlatformWindow. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add function returning the screen for a new geometry for geometry change events. This ensures that the checking is done in platform screen coordinates (which might differ from QScreen coordinates due to high-DPI changes) and also that no screen changes are emitted for child windows. Change-Id: I406750f59f006f834c386d09c0c85a804014924a Reviewed-by: Jørgen Lind Reviewed-by: Laszlo Agocs --- src/plugins/platforms/windows/qwindowswindow.cpp | 28 +++--------------------- src/plugins/platforms/xcb/qxcbwindow.cpp | 12 ++++------ 2 files changed, 7 insertions(+), 33 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 7d0b00b312..51497b3300 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1376,25 +1376,6 @@ void QWindowsWindow::handleResized(int wParam) } } -// Return the effective screen for full screen mode in a virtual desktop. -static QScreen *effectiveScreen(const QWindow *w) -{ - QRect geometry = w->geometry(); - if (!w->isTopLevel()) - geometry.moveTopLeft(w->mapToGlobal(geometry.topLeft())); - - QScreen *screen = w->screen(); - if (!screen->geometry().intersects(geometry)) { - foreach (QScreen *sibling, screen->virtualSiblings()) { - if (sibling->geometry().intersects(geometry)) { - screen = sibling; - break; - } - } - } - return screen; -} - void QWindowsWindow::handleGeometryChange() { //Prevent recursive resizes for Windows CE @@ -1411,12 +1392,9 @@ void QWindowsWindow::handleGeometryChange() fireExpose(QRegion(m_data.geometry), true); } if (previousGeometry.topLeft() != m_data.geometry.topLeft()) { - QWindow *w = window(); - if (w->isTopLevel()) { - QScreen *newScreen = effectiveScreen(w); - if (newScreen != w->screen()) - QWindowSystemInterface::handleWindowScreenChanged(w, newScreen); - } + QPlatformScreen *newScreen = screenForGeometry(m_data.geometry); + if (newScreen != screen()) + QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen()); } if (testFlag(SynchronousGeometryChangeEvent)) QWindowSystemInterface::flushWindowSystemEvents(); diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp index 0cc8c8dbfe..578b4d6ec1 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.cpp +++ b/src/plugins/platforms/xcb/qxcbwindow.cpp @@ -1842,14 +1842,10 @@ void QXcbWindow::handleConfigureNotifyEvent(const xcb_configure_notify_event_t * QPlatformWindow::setGeometry(rect); QWindowSystemInterface::handleGeometryChange(window(), rect); - if (!m_screen->availableGeometry().intersects(rect)) { - Q_FOREACH (QPlatformScreen* screen, m_screen->virtualSiblings()) { - if (screen->availableGeometry().intersects(rect)) { - m_screen = static_cast(screen); - QWindowSystemInterface::handleWindowScreenChanged(window(), m_screen->QPlatformScreen::screen()); - break; - } - } + QPlatformScreen *newScreen = screenForGeometry(rect); + if (newScreen != m_screen) { + m_screen = static_cast(newScreen); + QWindowSystemInterface::handleWindowScreenChanged(window(), newScreen->screen()); } m_configureNotifyPending = false; -- cgit v1.2.3