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

properly set title position for "Center (Full Width)" configuration.

Browse source 
Simplified title centering logic.

svn path=/trunk/KDE/kdebase/workspace/; revision=1210060
This commit is contained in:
Hugo Pereira Da Costa 2010-12-29 10:26:54 +00:00
parent 5ca57bf518
commit a6425b78e2
1 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
clients/oxygen/oxygenclient.cpp
View file

@ -376,15 +376,25 @@ namespace Oxygen
{ {
QRect titleRect( this->titleRect().adjusted( 0, -layoutMetric( LM_TitleEdgeTop ), 0, 0 ) ); QRect titleRect( this->titleRect().adjusted( 0, -layoutMetric( LM_TitleEdgeTop ), 0, 0 ) );
// when drawing title outline, shrink the rect so that it matches the actual caption size
if( active && configuration().drawTitleOutline() && isActive() ) if( active && configuration().drawTitleOutline() && isActive() )
{ {
if( configuration().centerTitleOnFullWidth() )
{
titleRect.setLeft( widget()->rect().left() + layoutMetric( LM_OuterPaddingLeft ) );
titleRect.setRight( widget()->rect().right() - layoutMetric( LM_OuterPaddingRight ) );
}
const QRect textRect( titleBoundingRect( options()->font( true, false), titleRect, caption() ) ); const QRect textRect( titleBoundingRect( options()->font( true, false), titleRect, caption() ) );
titleRect.setLeft( textRect.left() - layoutMetric( LM_TitleBorderLeft ) ); titleRect.setLeft( textRect.left() - layoutMetric( LM_TitleBorderLeft ) );
titleRect.setRight( textRect.right() + layoutMetric( LM_TitleBorderRight ) ); titleRect.setRight( textRect.right() + layoutMetric( LM_TitleBorderRight ) );
} else { } else {
// buttons are properly accounted for in titleBoundingRect method
titleRect.setLeft( widget()->rect().left() + layoutMetric( LM_OuterPaddingLeft ) ); titleRect.setLeft( widget()->rect().left() + layoutMetric( LM_OuterPaddingLeft ) );
titleRect.setRight( widget()->rect().right() - layoutMetric( LM_OuterPaddingRight ) ); titleRect.setRight( widget()->rect().right() - layoutMetric( LM_OuterPaddingRight ) );
@ -408,8 +418,19 @@ namespace Oxygen
boundingRect.setBottom( rect.bottom() ); boundingRect.setBottom( rect.bottom() );
// check bounding rect against input rect // check bounding rect against input rect
if( rect.left() > boundingRect.left() ) { boundingRect.setLeft( rect.left() ); } boundingRect.setLeft( qMax( rect.left(), boundingRect.left() ) );
if( rect.right() < boundingRect.right() ) { boundingRect.setRight( rect.right() ); } boundingRect.setRight( qMin( rect.right(), boundingRect.right() ) );
if( configuration().centerTitleOnFullWidth() )
{
/*
check bounding rect against max available space, for buttons
this is not needed if centerTitleOnFullWidth flag is set to false,
because it was already done before calling titleBoundingRect
*/
boundingRect.setLeft( qMax( titleRect().left(), boundingRect.left() ) );
boundingRect.setRight( qMin( titleRect().right(), boundingRect.right() ) );
}
return boundingRect; return boundingRect;
@ -879,7 +900,7 @@ namespace Oxygen
// see if tag is active // see if tag is active
const int itemCount( itemData_.count() ); const int itemCount( itemData_.count() );
// // check item bounding rect
if( !item.boundingRect_.isValid() ) return; if( !item.boundingRect_.isValid() ) return;
// create rect in which text is to be drawn // create rect in which text is to be drawn
@ -900,10 +921,16 @@ namespace Oxygen
const QList< ClientGroupItem >& items( clientGroupItems() ); const QList< ClientGroupItem >& items( clientGroupItems() );
const QString caption( itemCount == 1 ? this->caption() : items[index].title() ); const QString caption( itemCount == 1 ? this->caption() : items[index].title() );
// always make sure that titleRect never conflicts with window buttons if( !configuration().centerTitleOnFullWidth() )
QRect titleRect( this->titleRect() ); {
if( titleRect.left() > textRect.left() ) { textRect.setLeft( titleRect.left() ); } // always make sure that titleRect never conflicts with window buttons
if( titleRect.right() < textRect.right() ) { textRect.setRight( titleRect.right() ); } QRect titleRect( this->titleRect() );
if( titleRect.left() > textRect.left() ) { textRect.setLeft( titleRect.left() ); }
if( titleRect.right() < textRect.right() ) { textRect.setRight( titleRect.right() ); }
}
// adjust textRect
textRect = titleBoundingRect( painter->font(), textRect, caption );
// title outline // title outline
if( itemCount == 1 ) if( itemCount == 1 )
@ -914,14 +941,10 @@ namespace Oxygen
{ {
if( itemData_.isAnimated() ) { if( itemData_.isAnimated() ) {
textRect = titleBoundingRect( painter->font(), textRect, caption );
renderTitleOutline( painter, item.boundingRect_, palette ); renderTitleOutline( painter, item.boundingRect_, palette );
} else if( (isActive()||glowIsAnimated()) && configuration().drawTitleOutline() ) { } else if( (isActive()||glowIsAnimated()) && configuration().drawTitleOutline() ) {
// adjust textRect
textRect = titleBoundingRect( painter->font(), textRect, caption );
// adjusts boundingRect accordingly // adjusts boundingRect accordingly
QRect boundingRect( item.boundingRect_ ); QRect boundingRect( item.boundingRect_ );
boundingRect.setLeft( textRect.left() - layoutMetric( LM_TitleBorderLeft ) ); boundingRect.setLeft( textRect.left() - layoutMetric( LM_TitleBorderLeft ) );