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

Fixed logic for left/right bounding of titleRect.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1210067
This commit is contained in:
Hugo Pereira Da Costa 2010-12-29 10:40:17 +00:00
parent a6425b78e2
commit 469ec8e686
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
clients/oxygen/oxygenclient.cpp
View file

@ -418,24 +418,45 @@ namespace Oxygen
boundingRect.setBottom( rect.bottom() );
// check bounding rect against input rect
boundingRect.setLeft( qMax( rect.left(), boundingRect.left() ) );
boundingRect.setRight( qMin( rect.right(), boundingRect.right() ) );
boundRectTo( boundingRect, rect );
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() ) );
boundRectTo( boundingRect, titleRect() );
}
return boundingRect;
}
//_________________________________________________________
void Client::boundRectTo( QRect& rect, const QRect& bound ) const
{
if( bound.left() > rect.left() )
{
rect.moveLeft( bound.left() );
if( bound.right() < rect.right() )
{ rect.setRight( bound.right() ); }
} else if( bound.right() < rect.right() ) {
rect.moveRight( bound.right() );
if( bound.left() > rect.left() )
{ rect.setLeft( bound.left() ); }
}
return;
}
//_________________________________________________________
void Client::clearTargetItem( void )
{
@ -922,12 +943,7 @@ namespace Oxygen
const QString caption( itemCount == 1 ? this->caption() : items[index].title() );
if( !configuration().centerTitleOnFullWidth() )
{
// always make sure that titleRect never conflicts with window buttons
QRect titleRect( this->titleRect() );
if( titleRect.left() > textRect.left() ) { textRect.setLeft( titleRect.left() ); }
if( titleRect.right() < textRect.right() ) { textRect.setRight( titleRect.right() ); }
}
{ boundRectTo( textRect, titleRect() ); }
// adjust textRect
textRect = titleBoundingRect( painter->font(), textRect, caption );

3
clients/oxygen/oxygenclient.h
View file

@ -410,6 +410,9 @@ namespace Oxygen
/*! calculate and return title bounding rects in case of tabbed window */
void updateItemBoundingRects( bool alsoUpdate = true );
//! bound one rect to another
void boundRectTo( QRect&, const QRect& ) const;
private:
//! factory