nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

second stab at resistance

Browse source
This commit is contained in:
Dana Jansens 2002-08-02 15:58:35 +00:00
parent e9a5c7158a
commit 6fd2543588
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Window.cc
View file

@ -3139,12 +3139,12 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
wtop < (signed)(winrect.y() + winrect.height() - 1)) { wtop < (signed)(winrect.y() + winrect.height() - 1)) {
// snap left of other window? // snap left of other window?
if (dleft < resistance_size && dleft > dright) { if (dleft > 0 && dleft < resistance_size && dleft < dright) {
dx = winrect.left() - frame.rect.width(); dx = winrect.left() - frame.rect.width();
snapped = True; snapped = True;
} }
// snap right of other window? // snap right of other window?
else if (dright < resistance_size) { else if (dright > 0 && dright < resistance_size) {
dx = winrect.right() + 1; dx = winrect.right() + 1;
snapped = True; snapped = True;
} }
@ -3169,12 +3169,12 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
wleft < (signed)(winrect.x() + winrect.width() - 1)) { wleft < (signed)(winrect.x() + winrect.width() - 1)) {
// snap top of other window? // snap top of other window?
if (dtop < resistance_size && dtop > dbottom) { if (dtop > 0 && dtop < resistance_size && dtop < dbottom) {
dy = winrect.top() - frame.rect.height(); dy = winrect.top() - frame.rect.height();
snapped = True; snapped = True;
} }
// snap bottom of other window? // snap bottom of other window?
else if (dbottom < resistance_size) { else if (dbottom > 0 && dbottom < resistance_size) {
dy = winrect.bottom() + 1; dy = winrect.bottom() + 1;
snapped = True; snapped = True;
} }
@ -3223,17 +3223,17 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
dbottom = wbottom - srect.bottom(); dbottom = wbottom - srect.bottom();
// snap left? // snap left?
if (dleft < resistance_size && dleft > dright) if (dleft > 0 && dleft < resistance_size && dleft > dright)
dx = srect.left(); dx = srect.left();
// snap right? // snap right?
else if (dright < resistance_size) else if (dright > 0 && dright < resistance_size)
dx = srect.right() - frame.rect.width() + 1; dx = srect.right() - frame.rect.width() + 1;
// snap top? // snap top?
if (dtop < resistance_size && dtop > dbottom) if (dtop > 0 && dtop < resistance_size && dtop > dbottom)
dy = srect.top(); dy = srect.top();
// snap bottom? // snap bottom?
else if (dbottom < resistance_size) else if (dbottom > 0 && dbottom < resistance_size)
dy = srect.bottom() - frame.rect.height() + 1; dy = srect.bottom() - frame.rect.height() + 1;
} }
} }