yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implemented new buttons (from nuno)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1032950
This commit is contained in:
Hugo Pereira Da Costa 2009-10-08 23:01:35 +00:00
parent a6db3e0b09
commit 90f10f219a
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
clients/oxygen/oxygenbutton.cpp
View file

@ -208,35 +208,51 @@ namespace Oxygen
KColorScheme(palette.currentColorGroup()).foreground(KColorScheme::NegativeText).color(): KColorScheme(palette.currentColorGroup()).foreground(KColorScheme::NegativeText).color():
KColorScheme(palette.currentColorGroup()).decoration(KColorScheme::HoverColor).color(); KColorScheme(palette.currentColorGroup()).decoration(KColorScheme::HoverColor).color();
// make glow darker
glow = helper_.calcDarkColor( glow );
if( timeLineIsRunning() ) color = KColorUtils::mix( color, glow, opacity() ); if( timeLineIsRunning() ) color = KColorUtils::mix( color, glow, opacity() );
else if( status_ == Oxygen::Hovered ) color = glow; else if( status_ == Oxygen::Hovered ) color = glow;
// button shape color // button shape color
QColor bt = palette.window().color(); QColor bt = palette.window().color();
// draw button shape
painter.drawPixmap(0, 0, helper_.windecoButton(bt, status_ == Oxygen::Pressed, (21.0*client_.configuration().buttonSize())/22 ) );
// draw glow on hover // draw glow on hover
if( timeLineIsRunning() ) if( timeLineIsRunning() )
{ {
painter.drawPixmap(0, 0, helper_.windecoButtonGlow( helper_.alphaColor( glow, opacity() ), (21.0*client_.configuration().buttonSize())/22)); // mixed shadow and glow for smooth transition
painter.drawPixmap(0, 0, helper_.windecoButtonGlow( KColorUtils::mix( Qt::black, glow, opacity() ), (21.0*client_.configuration().buttonSize())/22));
} else if( status_ == Oxygen::Hovered ) { } else if( status_ == Oxygen::Hovered ) {
// glow only
painter.drawPixmap(0, 0, helper_.windecoButtonGlow(glow, (21.0*client_.configuration().buttonSize())/22)); painter.drawPixmap(0, 0, helper_.windecoButtonGlow(glow, (21.0*client_.configuration().buttonSize())/22));
} else {
// shadow only
painter.drawPixmap(0, 0, helper_.windecoButtonGlow(Qt::black, (21.0*client_.configuration().buttonSize())/22));
} }
// draw button icon // draw button shape
QLinearGradient lg = helper_.decoGradient( QRect( 4, 4, 13, 13 ), color); painter.drawPixmap(0, 0, helper_.windecoButton(bt, status_ == Oxygen::Pressed, (21.0*client_.configuration().buttonSize())/22.0 ) );
painter.setRenderHints(QPainter::Antialiasing);
qreal width( 1.4 );
// draw button icon
painter.setRenderHints(QPainter::Antialiasing);
qreal width( 1.2 );
{
painter.setBrush(Qt::NoBrush);
painter.setPen(QPen( helper_.calcLightColor( bt ), width, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
drawIcon(&painter, palette, type_);
painter.translate(0,-1.5);
painter.setBrush(Qt::NoBrush); painter.setBrush(Qt::NoBrush);
painter.setPen(QPen(color, width, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); painter.setPen(QPen(color, width, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
drawIcon(&painter, palette, type_); drawIcon(&painter, palette, type_);
}
} }