diff -r 9674c1a575e9 -r b8fae6b8a148 idlehomescreen/widgetmanager/src/wmportalbutton.cpp --- a/idlehomescreen/widgetmanager/src/wmportalbutton.cpp Mon Mar 15 12:39:47 2010 +0200 +++ b/idlehomescreen/widgetmanager/src/wmportalbutton.cpp Wed Mar 31 21:17:19 2010 +0300 @@ -525,36 +525,15 @@ MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - TRgb textColor( layoutText.Color() ); - - if ( IsDimmed() ) - { - const TInt KAlpha = 77; - textColor = iEikonEnv->ControlColor( EColorButtonText, *this ); - // try over-writing color from theme, ignore error. - AknsUtils::GetCachedColor( - skin, textColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 ); - textColor.SetAlpha( KAlpha ); - } - else if ( IsFocused() || iButtonPressed ) + TRgb textColor; + TInt err = AknsUtils::GetCachedColor( + skin, + textColor, + KAknsIIDQsnTextColors, + EAknsCIQsnTextColorsCG63 ); + if ( err != KErrNone ) { - textColor = iEikonEnv->ControlColor( EColorButtonTextPressed, *this ); - // try over-writing color from theme, ignore error. - AknsUtils::GetCachedColor( - skin, textColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG10 ); - } - else if ( textColor.Internal() <= 0 ) - { - textColor = iEikonEnv->ControlColor( EColorButtonText, *this ); - // try over-writing color from theme, ignore error. - AknsUtils::GetCachedColor( - skin, textColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 ); - } - else - { - // default for button - AknsUtils::GetCachedColor( - skin, textColor, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG80 ); + textColor = layoutText.Color(); } aGc.SetPenColor( textColor);