vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug on title alignment when left/right centered, and put titleRect calculation in separate method for clean-up 

svn path=/trunk/KDE/kdebase/workspace/; revision=1031796
icc-effect-5.14.5
Hugo Pereira Da Costa 2009-10-06 05:35:24 +00:00
parent f2fc1d6da3
commit 3e7a0f9fce
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clients/oxygen/oxygenclient.cpp
View File

@ -573,7 +573,7 @@ namespace Oxygen
}
//_________________________________________________________
QRect OxygenClient::titleBoundingRect( QPainter* painter, const QRect& frame, const QString& caption ) const
QRect OxygenClient::titleRect( const QRect& frame ) const
{
int extraBorder = ( isMaximized() && compositingActive() ) ? 0 : EXTENDED_HITAREA;
@ -591,16 +591,27 @@ namespace Oxygen
buttonsLeftWidth() - buttonsRightWidth() -
marginLeft - marginRight;
QRect titleRect( titleLeft, titleTop-1, titleWidth, titleHeight );
// maximum rect allocated for title
return QRect( titleLeft, titleTop-1, titleWidth, titleHeight );
}
//_________________________________________________________
QRect OxygenClient::titleBoundingRect( QPainter* painter, const QRect& frame, const QString& caption ) const
{
QRect titleRect( OxygenClient::titleRect( frame ) );
// get title bounding rect
QRect boundingRect = painter->boundingRect( titleRect, configuration().titleAlignment() | Qt::AlignVCenter, caption );
// adjust
// adjust to make sure bounding rect
// 1/ uses maximum height
// 2/ does not exceeds available space
boundingRect.setTop( frame.top() );
boundingRect.setBottom( titleTop+titleHeight );
boundingRect.setLeft( qMax( boundingRect.left(), titleLeft ) - 2*HFRAMESIZE );
boundingRect.setRight( qMin( boundingRect.right(), titleLeft + titleWidth ) + 2*HFRAMESIZE );
boundingRect.setBottom( titleRect.bottom() );
boundingRect.setLeft( qMax( boundingRect.left(), titleRect.left() ) );
boundingRect.setRight( qMin( boundingRect.right(), titleRect.right() ) );
return boundingRect;
@ -883,7 +894,7 @@ namespace Oxygen
// title outline
if( drawTitleOutline() )
{ renderTitleOutline( &painter, boundingRect, backgroundPalette( widget(), palette ) ); }
{ renderTitleOutline( &painter, boundingRect.adjusted( -2*HFRAMESIZE, 0, 2*HFRAMESIZE, 0 ), backgroundPalette( widget(), palette ) ); }
// draw title text
renderTitleText( &painter, boundingRect, configuration().titleAlignment() | Qt::AlignVCenter, titlebarTextColor( backgroundPalette( widget(), palette ) ) );

3
clients/oxygen/oxygenclient.h
View File

@ -136,6 +136,9 @@ namespace Oxygen
//! separator
virtual void renderSeparator( QPainter*, const QRect&, const QWidget*, const QColor& ) const;
//! get maximum space available for title
virtual QRect titleRect( const QRect& ) const;
//! get title bounding rect
virtual QRect titleBoundingRect( QPainter*, const QRect&, const QString& ) const;