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

Fixed handling of mask, so that it is set only when either shadowMode is not OxygenShadow

Browse source 
or compositing is not active.


svn path=/trunk/KDE/kdebase/workspace/; revision=1133588
This commit is contained in:
Hugo Pereira Da Costa 2010-06-02 06:04:17 +00:00
parent 29320ccd26
commit 98558973ef
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/oxygen/oxygenclient.cpp
View file

@ -36,6 +36,7 @@
#include <KLocale>
#include <KColorUtils>
#include <KDebug>
#include <QtGui/QApplication>
#include <QtGui/QLabel>
@ -269,22 +270,23 @@ namespace Oxygen
layoutMetric( LM_OuterPaddingLeft ), layoutMetric( LM_OuterPaddingTop ),
-layoutMetric( LM_OuterPaddingRight ), -layoutMetric( LM_OuterPaddingBottom ) ) );
QRegion mask;
if( configuration().frameBorder() == Configuration::BorderNone && !isShade() )
{
if( configuration().hideTitleBar() ) return QRegion();
else return compositingActive() ?
helper().decoRoundedMask( frame, 1, 1, 1, 0 ):
helper().roundedMask( frame, 1, 1, 1, 0 );
if( configuration().hideTitleBar() ) mask = QRegion();
else if( compositingActive() ) mask = (configuration().shadowMode() == Configuration::OxygenShadows ) ? QRegion():helper().decoRoundedMask( frame, 1, 1, 1, 0 );
else mask = helper().roundedMask( frame, 1, 1, 1, 0 );
} else {
return compositingActive() ?
helper().decoRoundedMask( frame ):
helper().roundedMask( frame );
if( compositingActive() ) mask = (configuration().shadowMode() == Configuration::OxygenShadows ) ? QRegion():helper().decoRoundedMask( frame );
else mask = helper().roundedMask( frame );
}
return mask;
}
//___________________________________________