From 8df96b21baadc8091e7bb5409662ec755b2977d2 Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Tue, 6 Oct 2009 06:36:52 +0000
Subject: [PATCH] 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
---
 clients/oxygen/oxygenbutton.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index 63a73c945b..85f135ccb2 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -183,14 +183,15 @@ namespace Oxygen
 
     // colors
     QColor color = palette.window().color();
-    QColor light = helper_.calcLightColor( color );
-    QColor dark = helper_.calcDarkColor( color );
-
-    dark.setAlpha(120);
 
+    // separator
     if( client_.drawSeparator() )
     { 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
     if (type_ == ButtonMenu)
     {
@@ -210,10 +211,6 @@ namespace Oxygen
     if( timeLineIsRunning() ) color = KColorUtils::mix( color, glow, opacity() );
     else if( status_ == Oxygen::Hovered ) color = glow;
 
-    // translate buttons up if window maximized
-    if(client_.isMaximized())
-    { painter.translate( 0, -1 ); }
-
     // button shape color
     QColor bt = palette.window().color();