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

x11: Disable NETWinInfo in X11Window

Browse source 
This piece of logic belongs in X11Window rather than Deleted as the
latter is merely a representation of a closed window.
This commit is contained in:
Vlad Zahorodnii 2023-03-13 21:48:49 +02:00
parent a42f7f4807
commit f3dc057c71
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/deleted.cpp
View file

@ -66,9 +66,6 @@ void Deleted::copyToDeleted(Window *window)
m_type = window->windowType(); m_type = window->windowType();
m_windowRole = window->windowRole(); m_windowRole = window->windowRole();
m_shade = window->isShade(); m_shade = window->isShade();
if (WinInfo *cinfo = dynamic_cast<WinInfo *>(info)) {
cinfo->disable();
}
if (window->isDecorated()) { if (window->isDecorated()) {
window->layoutDecorationRects(decoration_left, window->layoutDecorationRects(decoration_left,
decoration_top, decoration_top,

6
src/x11window.cpp
View file

@ -394,6 +394,9 @@ void X11Window::releaseWindow(bool on_shutdown)
info->setDesktop(0); info->setDesktop(0);
info->setState(NET::States(), info->state()); // Reset all state flags info->setState(NET::States(), info->state()); // Reset all state flags
} }
if (WinInfo *cinfo = dynamic_cast<WinInfo *>(info)) {
cinfo->disable();
}
xcb_connection_t *c = kwinApp()->x11Connection(); xcb_connection_t *c = kwinApp()->x11Connection();
m_client.deleteProperty(atoms->kde_net_wm_user_creation_time); m_client.deleteProperty(atoms->kde_net_wm_user_creation_time);
m_client.deleteProperty(atoms->net_frame_extents); m_client.deleteProperty(atoms->net_frame_extents);
@ -448,6 +451,9 @@ void X11Window::destroyWindow()
destroyDecoration(); destroyDecoration();
cleanGrouping(); cleanGrouping();
workspace()->removeX11Window(this); workspace()->removeX11Window(this);
if (WinInfo *cinfo = dynamic_cast<WinInfo *>(info)) {
cinfo->disable();
}
m_client.reset(); // invalidate m_client.reset(); // invalidate
m_wrapper.reset(); m_wrapper.reset();
m_frame.reset(); m_frame.reset();