[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kstyles/oxygen
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2010-12-21 12:52:48
Message-ID: 20101221125248.2F8A2AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208385 by hpereiradacosta:

Fixed color calculations for menu and menubar items.
1/ they are now consistent
2/ they work for all colorscheme.
The idea is that calcMidColor must be applied before backgroundMenuColor, because the \
later might trigger some  threshold effects in the former, resulting in "jumps" \
between menu-items.


 M  +7 -7      oxygenstyle.cpp  


--- trunk/KDE/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp #1208384:1208385
@@ -4432,7 +4432,7 @@
             if( ( intersected || !animated || animatedRect.isNull() ) && ( active || \
animated || timerIsActive ) )  {
 
-                QColor color( palette.color( QPalette::Window ) );
+                QColor color( helper().calcMidColor( palette.color( QPalette::Window \
                ) ) );
                 if( StyleConfigData::menuHighlightMode() != StyleConfigData::MM_DARK \
)  {
 
@@ -4448,7 +4448,7 @@
                         else color = KColorUtils::mix( color, KColorUtils::tint( \
color, helper().viewHoverBrush().brush( palette ).color() ) );  }
 
-                } else color = helper().calcMidColor( helper().backgroundColor( \
color, widget, r.center() ) ); +                } else color = \
helper().backgroundColor( color, widget, r.center() );  
                 // drawing
                 if( animated && intersected )
@@ -4580,7 +4580,7 @@
                 const QRect currentRect( animations().menuEngine().currentRect( \
                widget, Current ) );
                 const bool intersected( currentRect.contains( r.topLeft() ) );
 
-                const QColor color( helper().menuBackgroundColor( palette.color( \
QPalette::Window ), widget, r.center() ) ); +                const QColor color( \
helper().menuBackgroundColor( helper().calcMidColor( palette.color( QPalette::Window \
) ), widget, r.center() ) );  
                 if( animated && intersected ) renderMenuItemRect( option, r, color, \
                palette, painter, animations().menuEngine().opacity( widget, Current \
                ) );
                 else renderMenuItemRect( option, r, color, palette, painter );
@@ -8910,7 +8910,7 @@
 
             if( animatedRect.intersects( r ) )
             {
-                const QColor color( helper().menuBackgroundColor( palette.color( \
QPalette::Window ), widget, animatedRect.center() ) ); +                const QColor \
color( helper().menuBackgroundColor( helper().calcMidColor( palette.color( \
                QPalette::Window ) ), widget, animatedRect.center() ) );
                 renderMenuItemRect( option, animatedRect, color, palette, painter );
             }
 
@@ -8920,7 +8920,7 @@
             if( previousRect.intersects( r ) )
             {
 
-                const QColor color( helper().menuBackgroundColor( palette.color( \
QPalette::Window ), widget, previousRect.center() ) ); +                const QColor \
color( helper().menuBackgroundColor( helper().calcMidColor( palette.color( \
                QPalette::Window ) ), widget, previousRect.center() ) );
                 renderMenuItemRect( option, previousRect, color, palette, painter );
             }
 
@@ -8930,7 +8930,7 @@
             if( previousRect.intersects( r ) )
             {
                 const qreal opacity(  animations().menuEngine().opacity( widget, \
                Previous ) );
-                const QColor color( helper().menuBackgroundColor( palette.color( \
QPalette::Window ), widget, previousRect.center() ) ); +                const QColor \
color( helper().menuBackgroundColor( helper().calcMidColor( palette.color( \
                QPalette::Window ) ), widget, previousRect.center() ) );
                 renderMenuItemRect( option, previousRect, color, palette, painter, \
opacity );  }
 
@@ -8958,7 +8958,7 @@
 
             color = KColorUtils::mix( color, KColorUtils::tint( color, \
palette.color( QPalette::Highlight ), 0.6 ) );  
-        } else color = helper().calcMidColor( color );
+        }
 
         // special painting for items with submenus
         const QStyleOptionMenuItem* menuItemOption = qstyleoption_cast<const \
QStyleOptionMenuItem*>( opt );


[prev in list] [next in list] [prev in thread] [next in thread]