- Highlight has smaller corners than the frame

- The icon now also has a background

svn path=/trunk/KDE/kdebase/workspace/; revision=683752
This commit is contained in:
Rivo Laks 2007-07-05 08:57:10 +00:00
parent 5241fc4c33
commit e4d1976e84

View file

@ -461,7 +461,7 @@ void BoxSwitchEffect::paintHighlight( QRect area, QString text )
{ {
glPushAttrib( GL_CURRENT_BIT ); glPushAttrib( GL_CURRENT_BIT );
glColor4f( 1, 1, 1, alpha ); glColor4f( 1, 1, 1, alpha );
renderRoundBox( area ); renderRoundBox( area, 6 );
glPopAttrib(); glPopAttrib();
} }
#endif #endif
@ -564,6 +564,11 @@ void BoxSwitchEffect::paintWindowIcon( EffectWindow* w )
glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT ); glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT );
glEnable( GL_BLEND ); glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
// Render some background
glColor4f( 0, 0, 0, 0.5 );
renderRoundBox( QRect( x-3, y-3, width+6, height+6 ), 3 );
// Render the icon
glColor4f( 1, 1, 1, 1 );
windows[ w ]->iconTexture.bind(); windows[ w ]->iconTexture.bind();
const float verts[ 4 * 2 ] = const float verts[ 4 * 2 ] =
{ {