yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Dismiss XdgPopupWindow when the parent window is closed

Browse source 
XdgPopupWindow can't exist on its own.

BUG: 472013
This commit is contained in:
Vlad Zahorodnii 2024-07-09 09:50:08 +03:00
parent fef5791290
commit 09e0345ccc
3 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
autotests/integration/xdgshellwindow_test.cpp
View file

@ -107,6 +107,7 @@ private Q_SLOTS:
void testModal();
void testCloseModal();
void testCloseInactiveModal();
void testClosePopupOnParentUnmapped();
};
void TestXdgShellWindow::testXdgPopupReactive_data()
@ -2322,5 +2323,29 @@ void TestXdgShellWindow::testCloseInactiveModal()
QCOMPARE(workspace()->activeWindow(), otherWindow);
}
void TestXdgShellWindow::testClosePopupOnParentUnmapped()
{
// This test verifies that a popup window will be closed when the parent window is closed.
std::unique_ptr<KWayland::Client::Surface> parentSurface = Test::createSurface();
std::unique_ptr<Test::XdgToplevel> parentToplevel = Test::createXdgToplevelSurface(parentSurface.get());
Window *parent = Test::renderAndWaitForShown(parentSurface.get(), QSize(200, 200), Qt::cyan);
QVERIFY(parent);
std::unique_ptr<Test::XdgPositioner> positioner = Test::createXdgPositioner();
positioner->set_size(10, 10);
positioner->set_anchor_rect(10, 10, 10, 10);
std::unique_ptr<KWayland::Client::Surface> childSurface = Test::createSurface();
std::unique_ptr<Test::XdgPopup> popup = Test::createXdgPopupSurface(childSurface.get(), parentToplevel->xdgSurface(), positioner.get());
Window *child = Test::renderAndWaitForShown(childSurface.get(), QSize(10, 10), Qt::cyan);
QVERIFY(child);
QSignalSpy childClosedSpy(child, &Window::closed);
parentToplevel.reset();
parentSurface.reset();
QVERIFY(childClosedSpy.wait());
}
WAYLANDTEST_MAIN(TestXdgShellWindow)
#include "xdgshellwindow_test.moc"

11
src/workspace.cpp
View file

@ -464,16 +464,13 @@ Workspace::~Workspace()
#endif
if (waylandServer()) {
const QList<Window *> waylandWindows = waylandServer()->windows();
for (Window *window : waylandWindows) {
window->destroyWindow();
while (!waylandServer()->windows().isEmpty()) {
waylandServer()->windows()[0]->destroyWindow();
}
}
// We need a shadow copy because windows get removed as we go through them.
const QList<Window *> windows = m_windows;
for (Window *window : windows) {
window->destroyWindow();
while (!m_windows.isEmpty()) {
m_windows[0]->destroyWindow();
}
m_rulebook.reset();

3
src/xdgshellwindow.cpp
View file

@ -1672,6 +1672,8 @@ void XdgPopupWindow::handleRoleDestroyed()
{
disconnect(transientFor(), &Window::frameGeometryChanged,
this, &XdgPopupWindow::relayout);
disconnect(transientFor(), &Window::closed,
this, &XdgPopupWindow::destroyWindow);
m_shellSurface->disconnect(this);
XdgSurfaceWindow::handleRoleDestroyed();
@ -1815,6 +1817,7 @@ void XdgPopupWindow::initialize()
updateRelativePlacement();
connect(parent, &Window::frameGeometryChanged, this, &XdgPopupWindow::relayout);
connect(parent, &Window::closed, this, &XdgPopupWindow::destroyWindow);
workspace()->placement()->place(this, QRectF());
scheduleConfigure();