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

simplified color handling in renderFloatFrame

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1035784
This commit is contained in:
Hugo Pereira Da Costa 2009-10-15 20:59:24 +00:00
parent 5286a2f849
commit c0c3189ef2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/oxygen/oxygenclient.cpp
View file

@ -636,7 +636,7 @@ namespace Oxygen
{ {
helper().drawFloatFrame( helper().drawFloatFrame(
painter, frame, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ), painter, frame, backgroundColor( widget(), palette ),
!compositingActive(), isActive() && configuration().useOxygenShadows(), !compositingActive(), isActive() && configuration().useOxygenShadows(),
KDecoration::options()->color(ColorTitleBar) KDecoration::options()->color(ColorTitleBar)
); );
@ -646,7 +646,7 @@ namespace Oxygen
// for small borders, use a frame that matches the titlebar only // for small borders, use a frame that matches the titlebar only
QRect local( frame.topLeft(), QSize( frame.width(), layoutMetric(LM_TitleHeight) + layoutMetric(LM_TitleEdgeTop) ) ); QRect local( frame.topLeft(), QSize( frame.width(), layoutMetric(LM_TitleHeight) + layoutMetric(LM_TitleEdgeTop) ) );
helper().drawFloatFrame( helper().drawFloatFrame(
painter, local, backgroundPalette( widget(), palette ).color( widget()->backgroundRole() ), painter, local, backgroundColor( widget(), palette ),
false, isActive() && configuration().useOxygenShadows(), false, isActive() && configuration().useOxygenShadows(),
KDecoration::options()->color(ColorTitleBar) KDecoration::options()->color(ColorTitleBar)
); );
@ -656,7 +656,7 @@ namespace Oxygen
// for shaded maximized windows adjust frame and draw the bottom part of it // for shaded maximized windows adjust frame and draw the bottom part of it
helper().drawFloatFrame( 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(), !( compositingActive() || configuration().frameBorder() == OxygenConfiguration::BorderNone ), isActive(),
KDecoration::options()->color(ColorTitleBar), KDecoration::options()->color(ColorTitleBar),
TileSet::Bottom TileSet::Bottom