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

Removed duplication of code.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=269300
This commit is contained in:
Luboš Luňák 2003-11-24 14:30:31 +00:00
parent 3768a7f31f
commit fde7aedf9c
1 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
geometry.cpp
View file

@ -1650,7 +1650,8 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
bottom_marge = border_top;
}
if ( isResize() && moveResizeGeom.size() != previousMoveResizeGeom.size() )
bool update = false;
if( isResize())
{
if( moveResizeGeom.bottom() < desktopArea.top() + top_marge )
moveResizeGeom.setBottom( desktopArea.top() + top_marge );
@ -1664,6 +1665,27 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
moveResizeGeom.setTop( desktopArea.top());
moveResizeGeom.setSize( adjustedSize( moveResizeGeom.size() ) );
if( moveResizeGeom.size() != previousMoveResizeGeom.size())
update = true;
}
else if( isMove())
{
moveResizeGeom.moveTopLeft( workspace()->adjustClientPosition( this, moveResizeGeom.topLeft() ) );
if( moveResizeGeom.bottom() < desktopArea.top() + titlebar_marge ) // titlebar mustn't go out
moveResizeGeom.moveBottom( desktopArea.top() + titlebar_marge );
// no need to check top_marge, titlebar_marge already handles it
if( moveResizeGeom.top() > desktopArea.bottom() - bottom_marge )
moveResizeGeom.moveTop( desktopArea.bottom() - bottom_marge );
if( moveResizeGeom.right() < desktopArea.left() + left_marge )
moveResizeGeom.moveRight( desktopArea.left() + left_marge );
if( moveResizeGeom.left() > desktopArea.right() - right_marge )
moveResizeGeom.moveLeft(desktopArea.right() - right_marge );
if( moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft())
update = true;
}
if( update )
{
if (options->resizeMode == Options::Opaque )
{
setGeometry( moveResizeGeom );
@ -1676,32 +1698,6 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
drawbound( moveResizeGeom ); // they overlap; the paint event will come after this,
} // so the geometry tip will be painted above the outline
}
else if ( isMove() && moveResizeGeom.topLeft() != previousMoveResizeGeom.topLeft() )
{
moveResizeGeom.moveTopLeft( workspace()->adjustClientPosition( this, moveResizeGeom.topLeft() ) );
if( moveResizeGeom.bottom() < desktopArea.top() + titlebar_marge ) // titlebar mustn't go out
moveResizeGeom.moveBottom( desktopArea.top() + titlebar_marge );
// no need to check top_marge, titlebar_marge already handles it
if( moveResizeGeom.top() > desktopArea.bottom() - bottom_marge )
moveResizeGeom.moveTop( desktopArea.bottom() - bottom_marge );
if( moveResizeGeom.right() < desktopArea.left() + left_marge )
moveResizeGeom.moveRight( desktopArea.left() + left_marge );
if( moveResizeGeom.left() > desktopArea.right() - right_marge )
moveResizeGeom.moveLeft(desktopArea.right() - right_marge );
switch ( options->moveMode )
{
case Options::Opaque:
move( moveResizeGeom.topLeft() );
positionGeometryTip();
break;
case Options::Transparent:
clearbound();
positionGeometryTip();
drawbound( moveResizeGeom );
break;
}
}
if ( isMove() )
workspace()->clientMoved(globalPos, qt_x_time);
}