[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:       2011-01-03 11:34:35
Message-ID: 20110103113435.BB96AAC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211238 by hpereiradacosta:

Fixed background color for disabled TextEntries (QLineEdit and affiliated). 
It is now consistent with disabled QTextEdit, as well as with the disabled Foreground \
 color.


 M  +3 -6      oxygenstyle.cpp  


--- trunk/KDE/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp #1211237:1211238
@@ -3425,9 +3425,6 @@
     bool Style::drawPanelLineEditPrimitive( const QStyleOption* option, QPainter* \
painter, const QWidget* widget ) const  {
 
-        const State& flags( option->state );
-        const bool enabled( flags & State_Enabled );
-
         const QRect& r( option->rect );
         const QPalette& palette( option->palette );
 
@@ -3435,7 +3432,7 @@
         const QStyleOptionFrame *panel = qstyleoption_cast<const \
QStyleOptionFrame*>( option );  if( !panel ) return true;
 
-        const QBrush inputBrush( enabled ? palette.base() : palette.window() );
+        const QBrush inputBrush( palette.base() );
         const int lineWidth( panel->lineWidth );
 
         if( lineWidth > 0 )
@@ -7153,7 +7150,7 @@
             if( hasFocus ) opts |= Focus;
             if( ( flags & ( State_Sunken|State_On ) ) && !editable ) opts |= Sunken;
 
-            const QColor inputColor( enabled ? palette.color( QPalette::Base ) : \
palette.color( QPalette::Window ) ); +            const QColor inputColor( \
                palette.color( QPalette::Base ) );
             const QRect editField( subControlRect( CC_ComboBox, cb, \
SC_ComboBoxEditField, widget ) );  
             if( editable )
@@ -7555,7 +7552,7 @@
         const bool enabled( flags & State_Enabled );
         const bool mouseOver( enabled && ( flags & State_MouseOver ) );
         const bool hasFocus( flags & State_HasFocus );
-        const QColor inputColor( palette.color( enabled ? QPalette::Base : \
QPalette::Window ) ); +        const QColor inputColor( palette.color( QPalette::Base \
) );  
         if( sb->subControls & SC_SpinBoxFrame )
         {


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