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

Try to avoid resizing windows due to workarea changes.

Browse source 
BUG: 80545


svn path=/trunk/KDE/kdebase/kwin/; revision=409244
This commit is contained in:
Luboš Luňák 2005-05-04 12:14:34 +00:00
parent 4ac1e42768
commit 2322833673
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
geometry.cpp
View file

@ -962,18 +962,6 @@ void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRec
} }
return; return;
} }
if( isResizable())
{
if( rect.width() > area.width())
rect.setWidth( area.width());
if( rect.width() >= area.width() / 2 )
{
if( old_diff < 0 )
rect.setLeft( area.left() + ( -old_diff - 1 ) );
else // old_diff > 0
rect.setRight( area.right() - ( old_diff - 1 ));
}
}
if( isMovable()) if( isMovable())
{ {
if( old_diff < 0 ) // was in left third, keep distance from left edge if( old_diff < 0 ) // was in left third, keep distance from left edge
@ -981,9 +969,6 @@ void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRec
else // old_diff > 0 // was in right third, keep distance from right edge else // old_diff > 0 // was in right third, keep distance from right edge
rect.moveRight( area.right() - ( old_diff - 1 )); rect.moveRight( area.right() - ( old_diff - 1 ));
} }
// this isResizable() block is copied from above, the difference is
// the condition with 'area.width() / 2' - for windows that are not wide,
// moving is preffered to resizing
if( isResizable()) if( isResizable())
{ {
if( old_diff < 0 ) if( old_diff < 0 )
@ -991,6 +976,15 @@ void Client::checkDirection( int new_diff, int old_diff, QRect& rect, const QRec
else // old_diff > 0 else // old_diff > 0
rect.setRight( area.right() - ( old_diff - 1 )); rect.setRight( area.right() - ( old_diff - 1 ));
} }
if( rect.width() > area.width() && isResizable())
rect.setWidth( area.width());
if( isMovable())
{
if( rect.left() > area.left())
rect.moveLeft( area.left());
else if( rect.right() > area.right())
rect.moveRight( area.right());
}
} }
if( rect.right() < area.left() + 5 || rect.left() > area.right() - 5 ) if( rect.right() < area.left() + 5 || rect.left() > area.right() - 5 )
{ // not visible (almost) at all - try to make it at least partially visible { // not visible (almost) at all - try to make it at least partially visible