1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'qt/5.13' into dev"

Browse Source
This commit is contained in:
Paul Olav Tvete 2019-08-16 12:10:28 +02:00
commit 4da93aa94f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -350,7 +350,7 @@ void QWaylandWindow::setGeometry(const QRect &rect)
mSentInitialResize = true; mSentInitialResize = true;
} }
QRect exposeGeometry(QPoint(), geometry().size()); QRect exposeGeometry(QPoint(), geometry().size());
if (exposeGeometry != mLastExposeGeometry) if (isExposed() && !mInResizeFromApplyConfigure && exposeGeometry != mLastExposeGeometry)
sendExposeEvent(exposeGeometry); sendExposeEvent(exposeGeometry);
if (mShellSurface) if (mShellSurface)
@ -365,7 +365,9 @@ void QWaylandWindow::resizeFromApplyConfigure(const QSize &sizeWithMargins, cons
QRect geometry(windowGeometry().topLeft(), QSize(widthWithoutMargins, heightWithoutMargins)); QRect geometry(windowGeometry().topLeft(), QSize(widthWithoutMargins, heightWithoutMargins));
mOffset += offset; mOffset += offset;
mInResizeFromApplyConfigure = true;
setGeometry(geometry); setGeometry(geometry);
mInResizeFromApplyConfigure = false;
} }
void QWaylandWindow::sendExposeEvent(const QRect &rect) void QWaylandWindow::sendExposeEvent(const QRect &rect)

1
src/plugins/platforms/wayland/qwaylandwindow_p.h
View File

@ -264,6 +264,7 @@ private:
void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e); void handleMouseEventWithDecoration(QWaylandInputDevice *inputDevice, const QWaylandPointerEvent &e);
void handleScreensChanged(); void handleScreensChanged();
bool mInResizeFromApplyConfigure = false;
QRect mLastExposeGeometry; QRect mLastExposeGeometry;
static const wl_callback_listener callbackListener; static const wl_callback_listener callbackListener;