[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-04 19:47:53
Message-ID: 20100404194753.2F447AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1111074 by hpereiradacosta:

Backport r1111073:
Fixed precedence of Focus over Hover for comboboxes and generic frames animated \
highlight. This fixes some glitches notably when  hovering a focused editable \
combobox



 M  +5 -3      oxygen.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/oxygen.cpp #1111073:1111074
@@ -2535,8 +2535,9 @@
     const QColor inputColor = enabled ? pal.color(QPalette::Base) : \
                pal.color(QPalette::Window);
     QRect editField = subControlRect(CC_ComboBox, qstyleoption_cast<const \
QStyleOptionComplex*>(opt), SC_ComboBoxEditField, widget);  
-    animations().lineEditEngine().updateState( widget, Oxygen::AnimationHover, \
                mouseOver );
-    animations().lineEditEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus && !mouseOver ); +    // focus takes precedence over hover
+    animations().lineEditEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus ); +    animations().lineEditEngine().updateState( widget, \
Oxygen::AnimationHover, mouseOver && !hasFocus );  
     switch (primitive)
     {
@@ -3532,8 +3533,9 @@
             const bool hoverHighlight( isInputWidget && (flags&State_MouseOver) );
             const bool focusHighlight( isInputWidget && (flags&State_HasFocus) );
 
-            animations().lineEditEngine().updateState( widget, \
Oxygen::AnimationHover, hoverHighlight ); +            // assume focus takes \
                precedence over hover
             animations().lineEditEngine().updateState( widget, \
Oxygen::AnimationFocus, focusHighlight ); +            \
animations().lineEditEngine().updateState( widget, Oxygen::AnimationHover, \
hoverHighlight && !focusHighlight );  if (flags & State_Sunken)
             {
 


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