From c0c3189ef2dc9db7297fea02b16c4cc34b7f7b97 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Thu, 15 Oct 2009 20:59:24 +0000 Subject: [PATCH] simplified color handling in renderFloatFrame svn path=/trunk/KDE/kdebase/workspace/; revision=1035784 --- clients/oxygen/oxygenclient.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp index 5111b4fd62..b9cc378d4e 100644 --- a/clients/oxygen/oxygenclient.cpp +++ b/clients/oxygen/oxygenclient.cpp @@ -636,7 +636,7 @@ namespace Oxygen { helper().drawFloatFrame( - painter, frame, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ), + painter, frame, backgroundColor( widget(), palette ), !compositingActive(), isActive() && configuration().useOxygenShadows(), KDecoration::options()->color(ColorTitleBar) ); @@ -646,7 +646,7 @@ namespace Oxygen // for small borders, use a frame that matches the titlebar only QRect local( frame.topLeft(), QSize( frame.width(), layoutMetric(LM_TitleHeight) + layoutMetric(LM_TitleEdgeTop) ) ); helper().drawFloatFrame( - painter, local, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ), + painter, local, backgroundColor( widget(), palette ), false, isActive() && configuration().useOxygenShadows(), KDecoration::options()->color(ColorTitleBar) ); @@ -656,7 +656,7 @@ namespace Oxygen // for shaded maximized windows adjust frame and draw the bottom part of it helper().drawFloatFrame( - painter, frame.adjusted( -4, 0, 4, 0 ), backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ), + painter, frame.adjusted( -4, 0, 4, 0 ), backgroundColor( widget(), palette ), !( compositingActive() || configuration().frameBorder() == OxygenConfiguration::BorderNone ), isActive(), KDecoration::options()->color(ColorTitleBar), TileSet::Bottom