vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Copy NET::WindowType to Deleted 

This was suggested to be done in a comment. The existing code might
have returned incorrect results for Client. So let's get the primary
window type and use that one.
icc-effect-5.14.5
Martin Gräßlin 2015-03-04 08:26:57 +01:00
parent e8b14cd587
commit fec2b63102
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deleted.cpp
View File

@ -80,6 +80,7 @@ void Deleted::copyToDeleted(Toplevel* c)
m_layer = c->layer();
m_frame = c->frameId();
m_opacity = c->opacity();
m_type = c->windowType(true);
if (WinInfo* cinfo = dynamic_cast< WinInfo* >(info))
cinfo->disable();
Client* client = dynamic_cast<Client*>(c);
@ -169,11 +170,8 @@ bool Deleted::isDeleted() const
NET::WindowType Deleted::windowType(bool direct, int supportedTypes) const
{
Q_UNUSED(direct)
// TODO: maybe retrieve the actual window type when copying to deleted?
if (supportedTypes == 0) {
supportedTypes = SUPPORTED_UNMANAGED_WINDOW_TYPES_MASK;
}
return info->windowType(NET::WindowTypes(supportedTypes));
Q_UNUSED(supportedTypes)
return m_type;
}
void Deleted::mainClientClosed(Toplevel *client)

1
deleted.h
View File

@ -105,6 +105,7 @@ private:
bool m_wasClient;
Decoration::Renderer *m_decorationRenderer;
double m_opacity;
NET::WindowType m_type = NET::Unknown;
};
inline void Deleted::refWindow()