Fix #69787 - off-by-one error when checking top position.

CCMAIL: 69787-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=271907
This commit is contained in:
Luboš Luňák 2003-12-08 12:50:32 +00:00
parent c151780247
commit 9326a7f008

View file

@ -1712,8 +1712,8 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
// first move, then snap, then check bounds // first move, then snap, then check bounds
moveResizeGeom.moveTopLeft( topleft ); moveResizeGeom.moveTopLeft( topleft );
moveResizeGeom.moveTopLeft( workspace()->adjustClientPosition( this, moveResizeGeom.topLeft() ) ); moveResizeGeom.moveTopLeft( workspace()->adjustClientPosition( this, moveResizeGeom.topLeft() ) );
if( moveResizeGeom.bottom() < desktopArea.top() + titlebar_marge ) // titlebar mustn't go out if( moveResizeGeom.bottom() <= desktopArea.top() + titlebar_marge ) // titlebar mustn't go out
moveResizeGeom.moveBottom( desktopArea.top() + titlebar_marge ); moveResizeGeom.moveBottom( desktopArea.top() + titlebar_marge - 1 );
// no need to check top_marge, titlebar_marge already handles it // no need to check top_marge, titlebar_marge already handles it
if( moveResizeGeom.top() > desktopArea.bottom() - bottom_marge ) if( moveResizeGeom.top() > desktopArea.bottom() - bottom_marge )
moveResizeGeom.moveTop( desktopArea.bottom() - bottom_marge ); moveResizeGeom.moveTop( desktopArea.bottom() - bottom_marge );