added smooth transition for title bar text color when switching between active and inactive state (previously available for 'outline' mode only)
svn path=/trunk/KDE/kdebase/workspace/; revision=1025447
This commit is contained in:
parent
29cfa52c0a
commit
c955d16574
2 changed files with 15 additions and 9 deletions
|
@ -375,21 +375,24 @@ namespace Oxygen
|
|||
|
||||
//_________________________________________________________
|
||||
QColor OxygenClient::titlebarTextColor(const QPalette &palette)
|
||||
{
|
||||
if( timeLineIsRunning() ) return KColorUtils::mix(
|
||||
titlebarTextColor( palette, false ),
|
||||
titlebarTextColor( palette, true ),
|
||||
opacity() );
|
||||
else return titlebarTextColor( palette, isActive() );
|
||||
}
|
||||
|
||||
//_________________________________________________________
|
||||
QColor OxygenClient::titlebarTextColor(const QPalette &palette, bool active)
|
||||
{
|
||||
|
||||
if( configuration().drawTitleOutline() )
|
||||
{
|
||||
|
||||
if( timeLineIsRunning() )
|
||||
{
|
||||
return options()->color(ColorFont, active);
|
||||
|
||||
return KColorUtils::mix(
|
||||
options()->color(ColorFont, false),
|
||||
options()->color(ColorFont, true ), opacity() );
|
||||
|
||||
} else return options()->color(ColorFont, isActive());
|
||||
|
||||
} else if (isActive()) {
|
||||
} else if( active ){
|
||||
|
||||
return palette.color(QPalette::Active, QPalette::WindowText);
|
||||
|
||||
|
|
|
@ -169,6 +169,9 @@ namespace Oxygen
|
|||
//! text color
|
||||
QColor titlebarTextColor(const QPalette&);
|
||||
|
||||
//! text color
|
||||
QColor titlebarTextColor(const QPalette&, bool active);
|
||||
|
||||
//!@name size grip
|
||||
//@{
|
||||
|
||||
|
|
Loading…
Reference in a new issue