From 942958a870dd01ebe1f4b03b70d7dda1ed9f67ab Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 20 Mar 2018 15:03:41 +0100 Subject: 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 Reviewed-by: Pier Luigi Fiorini --- src/compositor/extensions/qwaylandxdgshellv6_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h index 6feb9506..e763f6ab 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(); -- cgit v1.2.1