diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-10-26 21:48:08 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-10-27 10:16:09 +0100 |
| commit | be8f647364ad2d995ff3b370710a35c83e760806 (patch) | |
| tree | 7125d7fd7140179ef529a5915e9e8f5f613b8fd2 | |
| parent | 2d0b251b1d3059970ca7cf221cfa8e64c9a021e6 (diff) | |
Send screen change events before expose events.
This fixes the "expose event received for window
with invalid geometry" warning from Qt Quick. The
window's current screen is now up to date when
processing the expose event.
Change-Id: Ia5c83e34154182699ec587835f9063809d819d7d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index ca98f6cec3..b33f71fd46 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -437,9 +437,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil; if (m_window) { NSUInteger screenIndex = [[NSScreen screens] indexOfObject:self.window.screen]; if (screenIndex != NSNotFound) { - m_platformWindow->updateExposedGeometry(); QCocoaScreen *cocoaScreen = QCocoaIntegration::instance()->screenAtIndex(screenIndex); QWindowSystemInterface::handleWindowScreenChanged(m_window, cocoaScreen->screen()); + m_platformWindow->updateExposedGeometry(); } } } else { |