Sync r982638 from Oxygen.
svn path=/trunk/KDE/kdebase/workspace/; revision=982640
This commit is contained in:
parent
8184ac42dc
commit
f024efed28
1 changed files with 12 additions and 13 deletions
|
@ -470,16 +470,16 @@ void OxygenClient::drawStripes(QPainter *p, QPalette &palette, const int start,
|
|||
void OxygenClient::updateWindowShape()
|
||||
{
|
||||
bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows();
|
||||
int w=widget()->width() - (int)SHADOW_WIDTH;
|
||||
int h=widget()->height() - (int)SHADOW_WIDTH;
|
||||
|
||||
if(maximized) {
|
||||
QRegion mask(0,0,w,h);
|
||||
setMask(mask);
|
||||
if(maximized || compositingActive()) {
|
||||
clearMask();
|
||||
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;
|
||||
QRegion mask(sw+4, sw+0, -sw+w-8, -sw+h);
|
||||
mask += QRegion(sw+0, sw+4, -sw+w, -sw+h-8);
|
||||
|
@ -488,7 +488,6 @@ void OxygenClient::updateWindowShape()
|
|||
|
||||
setMask(mask);
|
||||
}
|
||||
}
|
||||
|
||||
TileSet *OxygenClient::shadowTiles(const QColor& color, const QColor& glow, qreal size, bool active)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue