Add QML popup support for xdg_shell

Change-Id: I5b35ff3b1c6c2dc884b52e6f077c0f2bb2db68a2
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index b0ba00b16..251dc337a 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -39,7 +39,9 @@
 #include <QtWaylandCompositor/QWaylandQuickShellSurfaceItem>
 #include <QtWaylandCompositor/QWaylandCompositor>
 #include <QtWaylandCompositor/QWaylandInputDevice>
+#include <QtWaylandCompositor/private/qwaylandxdgshell_p.h>
 #include <QMouseEvent>
+#include <QGuiApplication>
 
 QT_BEGIN_NAMESPACE
 
@@ -168,6 +170,28 @@ void XdgShellIntegration::handleSurfaceSizeChanged()
     }
 }
 
+XdgPopupIntegration::XdgPopupIntegration(QWaylandQuickShellSurfaceItem *item)
+    : QWaylandQuickShellIntegration (item)
+    , m_xdgPopup(qobject_cast<QWaylandXdgPopup *>(item->shellSurface()))
+    , m_xdgShell(QWaylandXdgPopupPrivate::get(m_xdgPopup)->m_xdgShell)
+{
+    item->setSurface(m_xdgPopup->surface());
+    item->setPosition(QPointF(m_xdgPopup->position() * item->view()->output()->scaleFactor()));
+
+    QWaylandClient *client = m_xdgPopup->surface()->client();
+    QWaylandQuickShellEventFilter::startFilter(client, [&]() { m_xdgShell->closeAllPopups(); });
+
+    connect(m_xdgPopup, &QWaylandXdgPopup::destroyed, this, &XdgPopupIntegration::handlePopupDestroyed);
+}
+
+void XdgPopupIntegration::handlePopupDestroyed()
+{
+    QWaylandXdgShellPrivate *shellPrivate = QWaylandXdgShellPrivate::get(m_xdgShell);
+    auto popups = shellPrivate->m_xdgPopups;
+    if (popups.isEmpty())
+        QWaylandQuickShellEventFilter::cancelFilter();
+}
+
 }
 
 QT_END_NAMESPACE