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

Sync r982638 from Oxygen.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=982640
This commit is contained in:
Lucas Murray 2009-06-16 14:09:47 +00:00
parent 8184ac42dc
commit f024efed28
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/ozone/oxygenclient.cpp
View file

@ -470,16 +470,16 @@ void OxygenClient::drawStripes(QPainter *p, QPalette &palette, const int start,
void OxygenClient::updateWindowShape() void OxygenClient::updateWindowShape()
{ {
bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
int w=widget()->width() - (int)SHADOW_WIDTH;
int h=widget()->height() - (int)SHADOW_WIDTH;
if(maximized) { if(maximized || compositingActive()) {
QRegion mask(0,0,w,h); clearMask();
setMask(mask);
return; return;
} }
if (!compositingActive()) { int w=widget()->width() - (int)SHADOW_WIDTH;
int h=widget()->height() - (int)SHADOW_WIDTH;
// set a mask if compositing is not active
int sw = SHADOW_WIDTH; int sw = SHADOW_WIDTH;
QRegion mask(sw+4, sw+0, -sw+w-8, -sw+h); QRegion mask(sw+4, sw+0, -sw+w-8, -sw+h);
mask += QRegion(sw+0, sw+4, -sw+w, -sw+h-8); mask += QRegion(sw+0, sw+4, -sw+w, -sw+h-8);
@ -488,7 +488,6 @@ void OxygenClient::updateWindowShape()
setMask(mask); setMask(mask);
} }
}
TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qreal size, bool active) TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qreal size, bool active)
{ {