summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-03-20 15:03:41 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-03-21 07:47:00 +0000
commit942958a870dd01ebe1f4b03b70d7dda1ed9f67ab (patch)
tree4a6d33f10139d13b1d4a88f51818dcf7e4544e9c
parent034451087025ba69312600b16c3c0343744e78cd (diff)
Fix QWaylandXdgToplevelV6Private::lastSentConfigure()
Previously it would return the first pending configure instead of the last. This could sometimes cause sent state or size to get lost if handleFocusReceived() and one of the sendConfigure variants happened in rapid succession. Change-Id: I8cb379c4bcb7b05c027f7ede31e946ac5717d305 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r--src/compositor/extensions/qwaylandxdgshellv6_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h
index 6feb95060..e763f6ab4 100644
--- a/src/compositor/extensions/qwaylandxdgshellv6_p.h
+++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h
@@ -141,7 +141,7 @@ public:
};
QWaylandXdgToplevelV6Private(QWaylandXdgSurfaceV6 *xdgSurface, const QWaylandResource& resource);
- ConfigureEvent lastSentConfigure() const { return m_pendingConfigures.empty() ? m_lastAckedConfigure : m_pendingConfigures.first(); }
+ ConfigureEvent lastSentConfigure() const { return m_pendingConfigures.empty() ? m_lastAckedConfigure : m_pendingConfigures.last(); }
void handleAckConfigure(uint serial); //TODO: move?
void handleFocusLost();
void handleFocusReceived();