summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-12-21 14:41:03 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-12-26 09:22:05 +0000
commit09b6fcf3ec501cb94d89833745264a16c2a74209 (patch)
tree0d25f4cc1a6a5831560528669414074fb5482333
parentf2dc41b5babf0a7b51a1735f290540d7be695042 (diff)
Client xdg-shell: Fix protocol error for tooltips on popups
[ChangeLog][QPA plugin] Fixed a protocol error that used to happen when closing a menu with an active tooltip. Fixes: QTBUG-71734 Change-Id: I784fef08494fabaa4debea11f51116cf9de1f86e Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r--src/client/qwaylandwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index f596438b..470ae009 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -386,7 +386,7 @@ QWaylandScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
void QWaylandWindow::setVisible(bool visible)
{
if (visible) {
- if (window()->type() == Qt::Popup)
+ if (window()->type() & (Qt::Popup | Qt::ToolTip))
activePopups << this;
initWindow();
mDisplay->flushRequests();