diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-05 11:36:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-05 11:36:44 +0100 |
| commit | 32b6f5f41349d109f872caf42a44352744bd48e2 (patch) | |
| tree | 9367bfae6a0bd23c9fc79604e86a56072197f56e /src/plugins/shellintegration/xdg-shell | |
| parent | 789a2c79d04c477ea9a9ccd9d08a49f514693eec (diff) | |
| parent | fb0109c6acb8269d1fcdc20b7494c455ff2c74ad (diff) | |
| download | qtwayland-32b6f5f41349d109f872caf42a44352744bd48e2.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/compositor/compositor_api/qwaylandquickitem.cpp
Change-Id: I5e01a0731e880e3eb8eab349043756a5993e3050
Diffstat (limited to 'src/plugins/shellintegration/xdg-shell')
| -rw-r--r-- | src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp index 34cad810..8759cb8c 100644 --- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp @@ -385,6 +385,7 @@ void QWaylandXdgSurface::xdg_surface_configure(uint32_t serial) if (!m_configured) { // We have to do the initial applyConfigure() immediately, since that is the expose. applyConfigure(); + m_exposeRegion = QRegion(QRect(QPoint(), m_window->geometry().size())); } else { // Later configures are probably resizes, so we have to queue them up for a time when we // are not painting to the window. |