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

Merge branch 'KDE/4.9'

Browse source 
Conflicts:
	kwin/composite.cpp
This commit is contained in:
Thomas Lübking 2012-11-01 21:07:35 +01:00
commit 2f63321c0b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client.cpp
View file

@ -908,6 +908,11 @@ void Client::setShade(ShadeMode mode)
ShadeMode was_shade_mode = shade_mode;
shade_mode = mode;
// Decorations may turn off some borders when shaded
// this has to happen _before_ the tab alignment since it will restrict the minimum geometry
if (decoration)
decoration->borders(border_left, border_right, border_top, border_bottom);
// Update states of all other windows in this group
if (tabGroup())
tabGroup()->updateStates(this, TabGroup::Shaded);
@ -928,9 +933,6 @@ void Client::setShade(ShadeMode mode)
assert(decoration != NULL); // noborder windows can't be shaded
GeometryUpdatesBlocker blocker(this);
// Decorations may turn off some borders when shaded
if (decoration)
decoration->borders(border_left, border_right, border_top, border_bottom);
// TODO: All this unmapping, resizing etc. feels too much duplicated from elsewhere
if (isShade()) {