path: root/src/plugins/platforms/ios/
diff options
authorTor Arne Vestbø <>2017-06-28 13:56:47 +0200
committerTor Arne Vestbø <>2017-07-07 18:09:43 +0000
commit3a31c708790ba2bb3cf3dab32a17a83659a1acde (patch)
treef0c58fbedbabfd83ab94ce30cfe1bd8daae10530 /src/plugins/platforms/ios/
parent9381ca77b2e7b3224c7872828dbeb802e717e263 (diff)
Ensure all platforms send geometry events if request was not fulfilled
The logic of deciding whether or not to send resize and move events has been centralized in QGuiApplication. This ensures that if a window with geometry 100,100+200x200 is moved and resized to e.g. 0,0+100x100, but the window manager denies the request (because the window would e.g. overlap with system UI), and issues a geometry update with the original geometry, 100,100+200x200, we will still treat that as warrant of a move/resize event to the application, so the application knows that its position and size is as before. [ChangeLog][Qt Gui][QPA] QWindowSystemInterfacePrivate::handleGeometryChange no longer takes the old geometry as an argument. Task-number: QTBUG-57608 Change-Id: I1d471cc7a257fef958bdb1e56184fa95489403a3 Reviewed-by: Simon Hausmann <>
Diffstat (limited to 'src/plugins/platforms/ios/')
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/platforms/ios/ b/src/plugins/platforms/ios/
index a1110839ad..dcdb5ae53f 100644
--- a/src/plugins/platforms/ios/
+++ b/src/plugins/platforms/ios/
@@ -151,19 +151,12 @@
qWarning() << m_qioswindow->window()
<< "is backed by a UIView that has a transform set. This is not supported.";
- // The original geometry requested by setGeometry() might be different
- // from what we end up with after applying window constraints.
- QRect requestedGeometry = m_qioswindow->geometry();
- QRect actualGeometry = QRectF::fromCGRect(self.frame).toRect();
- QRect previousGeometry = requestedGeometry != actualGeometry ?
- requestedGeometry : qt_window_private(m_qioswindow->window())->geometry;
QWindow *window = m_qioswindow->window();
- QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(window, actualGeometry, previousGeometry);
+ QRect lastReportedGeometry = qt_window_private(window)->geometry;
+ QRect currentGeometry = QRectF::fromCGRect(self.frame).toRect();
+ QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(window, currentGeometry);
- if (actualGeometry.size() != previousGeometry.size()) {
+ if (currentGeometry.size() != lastReportedGeometry.size()) {
// Trigger expose event on resize
[self setNeedsDisplay];