diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-16 12:10:28 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-08-16 12:10:28 +0200 |
| commit | d1ff96e328a9bcfffc4196956387935fb79e291e (patch) | |
| tree | 6aa1fefb13f679305dd535f3b3786ebf6f6585a7 /src/client/qwaylandwindow.cpp | |
| parent | ed79c14c48501cb9d2ed922da78843f06ba208f0 (diff) | |
| parent | fc9c4a04d7359cb00a733c56cf85fc9737c9886d (diff) | |
| download | qtwayland-d1ff96e328a9bcfffc4196956387935fb79e291e.tar.gz | |
Merge remote-tracking branch 'qt/5.13' into dev
Change-Id: Ief5f30fc1dbd0e6531b19e723057b06e9bd419b4
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 8c462c11..ce58003c 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -350,7 +350,7 @@ void QWaylandWindow::setGeometry(const QRect &rect) mSentInitialResize = true; } QRect exposeGeometry(QPoint(), geometry().size()); - if (exposeGeometry != mLastExposeGeometry) + if (isExposed() && !mInResizeFromApplyConfigure && exposeGeometry != mLastExposeGeometry) sendExposeEvent(exposeGeometry); if (mShellSurface) @@ -365,7 +365,9 @@ void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, cons QRect geometry(windowGeometry().topLeft(), QSize(widthWithoutMargins, heightWithoutMargins)); mOffset += offset; + mInResizeFromApplyConfigure = true; setGeometry(geometry); + mInResizeFromApplyConfigure = false; } void QWaylandWindow::sendExposeEvent(const QRect &rect) |