From 98558973ef2c16b8984e412f8d10b82a15014d41 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 2 Jun 2010 06:04:17 +0000 Subject: [PATCH] Fixed handling of mask, so that it is set only when either shadowMode is not OxygenShadow or compositing is not active. svn path=/trunk/KDE/kdebase/workspace/; revision=1133588 --- clients/oxygen/oxygenclient.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index 8290cc2bb3..97d7cb9578 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -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; + } //___________________________________________