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

wayland: Destroy xdg shell clients when corresponding roles are about to be destroyed

Browse source 
This ensures that surface role objects can be still accessed when either
XdgToplevelClient or XdgPopupClient is destroyed. As far as I know, it
doesn't cause any problems right now, but this makes resource destruction
handling consistent, we tend to perform cleanup in aboutToBeDestroyed
signal slots.
This commit is contained in:
Vlad Zahorodnii 2021-08-12 13:03:35 +03:00
parent 51d82fc6e5
commit 4ca287641f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/xdgshellclient.cpp
View file

@ -54,6 +54,8 @@ XdgSurfaceClient::XdgSurfaceClient(XdgSurfaceInterface *shellSurface)
connect(shellSurface->surface(), &SurfaceInterface::mapped,
this, &XdgSurfaceClient::setReadyForPainting);
#endif
connect(shellSurface, &XdgSurfaceInterface::aboutToBeDestroyed,
this, &XdgSurfaceClient::destroyClient);
connect(shellSurface->surface(), &SurfaceInterface::aboutToBeDestroyed,
this, &XdgSurfaceClient::destroyClient);
@ -390,7 +392,7 @@ XdgToplevelClient::XdgToplevelClient(XdgToplevelInterface *shellSurface)
this, &XdgToplevelClient::handleTransientForChanged);
connect(shellSurface, &XdgToplevelInterface::initializeRequested,
this, &XdgToplevelClient::initialize);
connect(shellSurface, &XdgToplevelInterface::destroyed,
connect(shellSurface, &XdgToplevelInterface::aboutToBeDestroyed,
this, &XdgToplevelClient::destroyClient);
connect(shellSurface, &XdgToplevelInterface::maximumSizeChanged,
this, &XdgToplevelClient::handleMaximumSizeChanged);
@ -1749,7 +1751,7 @@ XdgPopupClient::XdgPopupClient(XdgPopupInterface *shellSurface)
this, &XdgPopupClient::initialize);
connect(shellSurface, &XdgPopupInterface::repositionRequested,
this, &XdgPopupClient::handleRepositionRequested);
connect(shellSurface, &XdgPopupInterface::destroyed,
connect(shellSurface, &XdgPopupInterface::aboutToBeDestroyed,
this, &XdgPopupClient::destroyClient);
}