Better active bar text handling.
svn path=/trunk/kdebase/kwin/; revision=34710
This commit is contained in:
parent
b1e3a4f9bb
commit
07e3f48e78
1 changed files with 7 additions and 4 deletions
|
@ -277,8 +277,6 @@ void SystemClient::paintEvent( QPaintEvent* )
|
||||||
p.fillRect(t, options->colorGroup(Options::Frame, false).
|
p.fillRect(t, options->colorGroup(Options::Frame, false).
|
||||||
brush(QColorGroup::Button));
|
brush(QColorGroup::Button));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QRegion r = rect();
|
QRegion r = rect();
|
||||||
r = r.subtract( t );
|
r = r.subtract( t );
|
||||||
p.setClipRegion( r );
|
p.setClipRegion( r );
|
||||||
|
@ -290,9 +288,14 @@ void SystemClient::paintEvent( QPaintEvent* )
|
||||||
|
|
||||||
p.setPen(options->color(Options::Font, isActive()));
|
p.setPen(options->color(Options::Font, isActive()));
|
||||||
p.setFont(options->font(isActive()));
|
p.setFont(options->font(isActive()));
|
||||||
p.setBackgroundMode(OpaqueMode);
|
if(isActive()){
|
||||||
|
QFontMetrics fm(options->font(true));
|
||||||
|
p.fillRect(t.x()+((t.width()-fm.width(caption()))/2)-4, t.y(),
|
||||||
|
fm.width(caption())+8, t.height(),
|
||||||
|
colorGroup().brush(QColorGroup::Background));
|
||||||
|
}
|
||||||
|
|
||||||
p.drawText( t, AlignCenter, caption() );
|
p.drawText( t, AlignCenter, caption() );
|
||||||
p.setBackgroundMode(TransparentMode);
|
|
||||||
|
|
||||||
qDrawShadePanel(&p, rect().x()+1, rect().bottom()-6, 24, 6,
|
qDrawShadePanel(&p, rect().x()+1, rect().bottom()-6, 24, 6,
|
||||||
options->colorGroup(Options::Handle, isActive()), false);
|
options->colorGroup(Options::Handle, isActive()), false);
|
||||||
|
|
Loading…
Reference in a new issue