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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/kstyles/oxygen
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-04-21 3:24:34
Message-ID: 20100421032434.DF38CAC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1117060 by hpereiradacosta:

Backport r1117059
fixed mouseOver precedence over Focus for pushButtons when animating



 M  +13 -7     oxygen.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/oxygen.cpp #1117059:1117060
@@ -337,8 +337,9 @@
     if (option->state & State_HasFocus) opts |= Focus;
     if (enabled && (option->state & State_MouseOver)) opts |= Hover;
 
+    // mouseOver has precedence over focus
     animations().widgetStateEngine().updateState( widget, Oxygen::AnimationHover, \
                mouseOver );
-    animations().widgetStateEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus ); +    animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus && !mouseOver );  
     QRect rect( option->rect );
     const QPalette &pal( option->palette );
@@ -392,8 +393,9 @@
 
     } else {
 
+        // mouseOver has precedence over focus
         animations().widgetStateEngine().updateState( widget, \
                Oxygen::AnimationHover, mouseOver );
-        animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus ); +        \
animations().widgetStateEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus&&!mouseOver );  
     }
 
@@ -1419,8 +1421,9 @@
 
             bool hasFocus = flags & State_HasFocus;
 
+            // mouseOver has precedence over focus
             animations().widgetStateEngine().updateState( widget, \
                Oxygen::AnimationHover, mouseOver );
-            animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus ); +            \
animations().widgetStateEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus&&!mouseOver );  
             if( enabled && animations().widgetStateEngine().isAnimated( widget, \
Oxygen::AnimationHover ) )  {
@@ -1476,8 +1479,11 @@
 
 
             bool hasFocus = flags & State_HasFocus;
+
+            // mouseOver has precedence over focus
             animations().widgetStateEngine().updateState( widget, \
                Oxygen::AnimationHover, mouseOver );
-            animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus ); +            \
animations().widgetStateEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus && !mouseOver ); +
             if( enabled && animations().widgetStateEngine().isAnimated( widget, \
Oxygen::AnimationHover ) )  {
 
@@ -3039,12 +3045,12 @@
             if( isInToolBar )
             {
 
-              animations().toolBarEngine().updateState( widget, \
Oxygen::AnimationHover, mouseOver ); +                \
animations().toolBarEngine().updateState( widget, Oxygen::AnimationHover, mouseOver \
);  
             } else {
 
-              animations().widgetStateEngine().updateState( widget, \
                Oxygen::AnimationHover, mouseOver );
-              animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus ); +                \
animations().widgetStateEngine().updateState( widget, Oxygen::AnimationHover, \
mouseOver ); +                animations().widgetStateEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus&&!mouseOver );  
             }
 


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