removed unused light/dark colors; moved painter translation before drawing of menu icon for consistency with other buttons
svn path=/trunk/KDE/kdebase/workspace/; revision=1031800
This commit is contained in:
parent
36e2deba85
commit
8df96b21ba
1 changed files with 5 additions and 8 deletions
|
@ -183,14 +183,15 @@ namespace Oxygen
|
||||||
|
|
||||||
// colors
|
// colors
|
||||||
QColor color = palette.window().color();
|
QColor color = palette.window().color();
|
||||||
QColor light = helper_.calcLightColor( color );
|
|
||||||
QColor dark = helper_.calcDarkColor( color );
|
|
||||||
|
|
||||||
dark.setAlpha(120);
|
|
||||||
|
|
||||||
|
// separator
|
||||||
if( client_.drawSeparator() )
|
if( client_.drawSeparator() )
|
||||||
{ client_.renderSeparator( &painter, rect(), this, color ); }
|
{ client_.renderSeparator( &painter, rect(), this, color ); }
|
||||||
|
|
||||||
|
// translate buttons up if window maximized
|
||||||
|
if(client_.isMaximized())
|
||||||
|
{ painter.translate( 0, -1 ); }
|
||||||
|
|
||||||
// for menu button the application icon is used
|
// for menu button the application icon is used
|
||||||
if (type_ == ButtonMenu)
|
if (type_ == ButtonMenu)
|
||||||
{
|
{
|
||||||
|
@ -210,10 +211,6 @@ namespace Oxygen
|
||||||
if( timeLineIsRunning() ) color = KColorUtils::mix( color, glow, opacity() );
|
if( timeLineIsRunning() ) color = KColorUtils::mix( color, glow, opacity() );
|
||||||
else if( status_ == Oxygen::Hovered ) color = glow;
|
else if( status_ == Oxygen::Hovered ) color = glow;
|
||||||
|
|
||||||
// translate buttons up if window maximized
|
|
||||||
if(client_.isMaximized())
|
|
||||||
{ painter.translate( 0, -1 ); }
|
|
||||||
|
|
||||||
// button shape color
|
// button shape color
|
||||||
QColor bt = palette.window().color();
|
QColor bt = palette.window().color();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue