Really fix the crash on gwenview startup this time.
Apparently a Toplevel isn't always a Client when the client rect is different from the toplevel rect. svn path=/trunk/KDE/kdebase/workspace/; revision=980458
This commit is contained in:
parent
b466509093
commit
33b8ab7d91
1 changed files with 2 additions and 2 deletions
|
@ -480,9 +480,9 @@ WindowQuadList Scene::Window::buildQuads( bool force ) const
|
||||||
ret = makeQuads( WindowQuadContents, shape()); // has no decoration
|
ret = makeQuads( WindowQuadContents, shape()); // has no decoration
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Client *client = static_cast<Client*>( toplevel );
|
Client *client = dynamic_cast<Client*>( toplevel );
|
||||||
QRegion contents = clientShape();
|
QRegion contents = clientShape();
|
||||||
QRegion decoration = (Workspace::self()->decorationHasAlpha() ?
|
QRegion decoration = (client && Workspace::self()->decorationHasAlpha() ?
|
||||||
QRegion(client->decorationRect()) : shape()) - contents;
|
QRegion(client->decorationRect()) : shape()) - contents;
|
||||||
ret = makeQuads( WindowQuadContents, contents );
|
ret = makeQuads( WindowQuadContents, contents );
|
||||||
ret += makeQuads( WindowQuadDecoration, decoration );
|
ret += makeQuads( WindowQuadDecoration, decoration );
|
||||||
|
|
Loading…
Reference in a new issue