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

Make the Tabstrip decoration follow font size settings.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1062336
This commit is contained in:
Lucas Murray 2009-12-14 11:22:05 +00:00
parent c1d2862b54
commit 1c02f9aaf6
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clients/tabstrip/tabstripdecoration.cpp
View file

@ -103,18 +103,20 @@ void TabstripDecoration::paintTab( QPainter &painter, const QRect &geom, ClientG
{ {
QRect rect( geom.x() + 25, geom.y(), geom.width() - 48, geom.height() ); QRect rect( geom.x() + 25, geom.y(), geom.width() - 48, geom.height() );
QRect text; QRect text;
QFont font; QFont font = options()->font( active );
QFontMetrics metrics( font ); QFontMetrics metrics( font );
QString string = metrics.elidedText( item.title(), Qt::ElideRight, rect.width() ); QString string = metrics.elidedText( item.title(), Qt::ElideRight, rect.width() );
painter.setFont( font );
painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string, &text ); painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string, &text );
painter.drawPixmap( text.x() - 22, rect.y() + 3, item.icon().pixmap( 16 )); painter.drawPixmap( text.x() - 22, rect.y() + 3, item.icon().pixmap( 16 ));
} }
else else
{ {
QRect rect( geom.x() + 5, geom.y(), geom.width() - 28, geom.height() ); QRect rect( geom.x() + 5, geom.y(), geom.width() - 28, geom.height() );
QFont font; QFont font = options()->font( active );
QFontMetrics metrics( font ); QFontMetrics metrics( font );
QString string = metrics.elidedText( item.title(), Qt::ElideRight, rect.width() ); QString string = metrics.elidedText( item.title(), Qt::ElideRight, rect.width() );
painter.setFont( font );
painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string ); painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string );
} }
} }
@ -207,9 +209,10 @@ void TabstripDecoration::paintEvent( QPaintEvent * )
painter.setPen( textColor ); painter.setPen( textColor );
QRect rect( titleRect().x() + 2, titleRect().y(), QRect rect( titleRect().x() + 2, titleRect().y(),
titleRect().width() - 6, titleRect().height() - 3 ); titleRect().width() - 6, titleRect().height() - 3 );
QFont font; QFont font = options()->font( isActive() );
QFontMetrics metrics( font ); QFontMetrics metrics( font );
QString string = metrics.elidedText( caption(), Qt::ElideRight, rect.width() ); QString string = metrics.elidedText( caption(), Qt::ElideRight, rect.width() );
painter.setFont( font );
painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string ); painter.drawText( rect, TabstripFactory::titleAlign() | Qt::AlignVCenter, string );
} }
} }