1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client: Close popups on xdg_popup::popup_done

Browse Source 
Change-Id: I6d3b1ec5c22e6d07ed87948074d886cc9aa126ef
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2016-11-16 14:43:20 +01:00 committed by Paul Olav Tvete
parent 9fc25b4a60
commit 882f20bbf4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/qwaylandxdgpopup.cpp
View File

@ -45,6 +45,7 @@ QWaylandXdgPopup::QWaylandXdgPopup(struct ::xdg_popup *popup, QWaylandWindow *wi
: QWaylandShellSurface(window) : QWaylandShellSurface(window)
, QtWayland::xdg_popup(popup) , QtWayland::xdg_popup(popup)
, m_extendedWindow(nullptr) , m_extendedWindow(nullptr)
, m_window(window)
{ {
if (window->display()->windowExtension()) if (window->display()->windowExtension())
m_extendedWindow = new QWaylandExtendedSurface(window); m_extendedWindow = new QWaylandExtendedSurface(window);
@ -62,6 +63,11 @@ void QWaylandXdgPopup::setType(Qt::WindowType type, QWaylandWindow *transientPar
Q_UNUSED(transientParent); Q_UNUSED(transientParent);
} }
void QWaylandXdgPopup::xdg_popup_popup_done()
{
m_window->window()->close();
}
} }
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/plugins/platforms/wayland/qwaylandxdgpopup_p.h
View File

@ -70,8 +70,12 @@ public:
void setType(Qt::WindowType type, QWaylandWindow *transientParent) override; void setType(Qt::WindowType type, QWaylandWindow *transientParent) override;
protected:
void xdg_popup_popup_done() override;
private: private:
QWaylandExtendedSurface *m_extendedWindow; QWaylandExtendedSurface *m_extendedWindow;
QWaylandWindow *m_window;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE