diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index cd123f9244..0e01afbeb6 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -1355,7 +1355,6 @@ namespace Oxygen if( configuration().useOxygenShadows() && glowIsAnimated() && !isForcedActive() ) { - //tileSet = shadowCache().tileSet( this, glowIntensity() ); tileSet = shadowCache().tileSet( background, key, glowIntensity() ); } else tileSet = shadowCache().tileSet( background, key ); @@ -1387,7 +1386,7 @@ namespace Oxygen // disable bottom corners when border frame is too small and window is not shaded if( configuration().frameBorder() == Configuration::BorderNone && !isShade() ) bottom = 0; - QRegion mask( helper().roundedRegion( frame, left, right, top, bottom ) ); + QRegion mask( helper().roundedMask( frame, left, right, top, bottom ) ); // in no-border configuration, an extra pixel is added to the mask // in order to get the corners color right in case of title highlighting. diff --git a/clients/oxygen/oxygenshadowcache.cpp b/clients/oxygen/oxygenshadowcache.cpp index 1b1859c831..4b4aee97aa 100644 --- a/clients/oxygen/oxygenshadowcache.cpp +++ b/clients/oxygen/oxygenshadowcache.cpp @@ -306,11 +306,15 @@ namespace Oxygen lg.setColorAt(0.51, helper().backgroundBottomColor(color) ); lg.setColorAt(1.0, helper().backgroundBottomColor(color) ); - // draw ellipse. p.setBrush( lg ); p.drawEllipse( QRectF( size-4, size-4, 8, 8 ) ); + // mask + p.setCompositionMode(QPainter::CompositionMode_DestinationOut); + p.setBrush( Qt::black ); + p.drawEllipse( QRectF( size-3, size-3, 6, 6 ) ); + p.end(); return shadow;