[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-20 20:53:52
Message-ID: 20100420205352.767DEAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1117007 by hpereiradacosta:

Backport r117005:
Fixed hover over focus precedence for non-editable comboboxes.



 M  +11 -3     oxygen.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/oxygen.cpp #1117006:1117007
@@ -2538,10 +2538,18 @@
     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);  
-    // focus takes precedence over hover
-    animations().lineEditEngine().updateState( widget, Oxygen::AnimationFocus, \
                hasFocus );
-    animations().lineEditEngine().updateState( widget, Oxygen::AnimationHover, \
mouseOver && !hasFocus ); +    if( editable )
+    {
 
+        // focus takes precedence over hover for editable comboboxes
+        animations().lineEditEngine().updateState( widget, Oxygen::AnimationFocus, \
hasFocus ); +        animations().lineEditEngine().updateState( widget, \
Oxygen::AnimationHover, mouseOver && !hasFocus ); +    } else {
+        // hover takes precedence over focus for read-only comboboxes
+        animations().lineEditEngine().updateState( widget, Oxygen::AnimationHover, \
mouseOver ); +        animations().lineEditEngine().updateState( widget, \
Oxygen::AnimationFocus, hasFocus && !mouseOver ); +    }
+
     switch (primitive)
     {
         case Generic::Frame:


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