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

stab #3. window-to-window works. window-to-screen doesnt

Browse source
This commit is contained in:
Dana Jansens 2002-08-02 16:42:23 +00:00
parent 6fd2543588
commit d94e8c5068
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Window.cc
View file

@ -3129,22 +3129,33 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
bool snapped = False; bool snapped = False;
const Rect &winrect = *it; const Rect &winrect = *it;
// if the window is already over top of this snap target, then
// resistance is futile, so just ignore it
if (screen->doOpaqueMove()) {
if (winrect.intersects(frame.rect))
continue;
} else {
if (winrect.intersects(frame.changing))
continue;
}
int dleft = wright - winrect.left(), int dleft = wright - winrect.left(),
dright = wleft - winrect.right(), dright = winrect.right() - wleft,
dtop = wbottom - winrect.top(), dtop = wbottom - winrect.top(),
dbottom = wtop - winrect.bottom(); dbottom = winrect.bottom() - wtop;
// if the windows are in the same plane vertically // if the windows are in the same plane vertically
if (wtop >= (signed)(winrect.y() - frame.rect.height() + 1) && if (wtop >= (signed)(winrect.y() - frame.rect.height() + 1) &&
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 > 0 && dleft < resistance_size && dleft < dright) { if (dleft >= 0 && dleft < resistance_size) {
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 > 0 && dright < resistance_size) { else if (dright >= 0 && dright < resistance_size) {
dx = winrect.right() + 1; dx = winrect.right() + 1;
snapped = True; snapped = True;
} }
@ -3169,7 +3180,7 @@ 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 > 0 && dtop < resistance_size && dtop < dbottom) { if (dtop >= 0 && dtop < resistance_size) {
dy = winrect.top() - frame.rect.height(); dy = winrect.top() - frame.rect.height();
snapped = True; snapped = True;
} }
@ -3223,14 +3234,14 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
dbottom = wbottom - srect.bottom(); dbottom = wbottom - srect.bottom();
// snap left? // snap left?
if (dleft > 0 && dleft < resistance_size && dleft > dright) if (dleft > 0 && dleft < resistance_size)
dx = srect.left(); dx = srect.left();
// snap right? // snap right?
else if (dright > 0 && 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 > 0 && dtop < resistance_size && dtop > dbottom) if (dtop > 0 && dtop < resistance_size)
dy = srect.top(); dy = srect.top();
// snap bottom? // snap bottom?
else if (dbottom > 0 && dbottom < resistance_size) else if (dbottom > 0 && dbottom < resistance_size)