diff options
author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-07 15:42:35 (GMT) |
---|---|---|
committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-02-08 10:07:03 (GMT) |
commit | ae25e6be41aaba90507022d792e2defcaf4cbfb6 (patch) | |
tree | 345f133c27364bca46aee820461db1d1663ad151 /src/gui/kernel | |
parent | dce6cb12d22d7356fc2d45fd81f2797f9ae44190 (diff) | |
download | Qt-ae25e6be41aaba90507022d792e2defcaf4cbfb6.zip Qt-ae25e6be41aaba90507022d792e2defcaf4cbfb6.tar.gz Qt-ae25e6be41aaba90507022d792e2defcaf4cbfb6.tar.bz2 |
Removed obsolete code that was incorrectly handling ConfigureNotify
The code in question was calling XSync and then processing ConfigureNotify
requests, but only using the width/height information from the event,
while ignoring the x,y properties. The code was consuming synthetic
ConfigureNotify with x,y in root coordinate system that we are supposed
to receive from the window manager, which broke mapFromGlobal/mapToGlobal
behavior (after cdd776a91e65bf5c30cea1bab9823134a3f797d0)
Reviewed-by: Olivier Goffart
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 2c51722..823f1b1 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -5314,18 +5314,6 @@ bool QETWidget::translateConfigEvent(const XEvent *event) } if (wasResize) { - static bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt(); - if (d->extra->compress_events && !slowResize && !data->in_show && isVisible()) { - QApplication::syncX(); - XEvent otherEvent; - while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, &otherEvent) - && !qt_x11EventFilter(&otherEvent) && !x11Event(&otherEvent) - && otherEvent.xconfigure.event == otherEvent.xconfigure.window) { - data->crect.setWidth(otherEvent.xconfigure.width); - data->crect.setHeight(otherEvent.xconfigure.height); - } - } - if (isVisible() && data->crect.size() != oldSize) { Q_ASSERT(d->extra->topextra); QWidgetBackingStore *bs = d->extra->topextra->backingStore.data(); @@ -5334,7 +5322,7 @@ bool QETWidget::translateConfigEvent(const XEvent *event) // resize optimization in order to get invalidated regions for resized widgets. // The optimization discards all invalidateBuffer() calls since we're going to // repaint everything anyways, but that's not the case with static contents. - if (!slowResize && !hasStaticContents) + if (!hasStaticContents) d->extra->topextra->inTopLevelResize = true; QResizeEvent e(data->crect.size(), oldSize); QApplication::sendSpontaneousEvent(this, &e); |