diff options
author | mathias <mathias> | 2005-01-20 23:48:24 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-01-20 23:48:24 (GMT) |
commit | 6f53cc5120e84607b875a0157ca789e436093e31 (patch) | |
tree | f65ace63a38e13f2ca5db18bc206861e71411373 | |
parent | ab1a422ac60e2c199978e38d574c57d3924bd60f (diff) | |
download | fluxbox-6f53cc5120e84607b875a0157ca789e436093e31.zip fluxbox-6f53cc5120e84607b875a0157ca789e436093e31.tar.bz2 |
cosmetic
-rw-r--r-- | src/Window.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Window.cc b/src/Window.cc index b09498d..3fb0fb5 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -2798,8 +2798,8 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2798 | dx = screen().width() - me.x_root-1; // move mouse to screen width - 1 | 2798 | dx = screen().width() - me.x_root-1; // move mouse to screen width - 1 |
2799 | } | 2799 | } |
2800 | if (new_id != cur_id) { | 2800 | if (new_id != cur_id) { |
2801 | XWarpPointer(display, None, None, 0, 0, 0, 0, dx, 0); | ||
2802 | 2801 | ||
2802 | XWarpPointer(display, None, None, 0, 0, 0, 0, dx, 0); | ||
2803 | screen().changeWorkspaceID(new_id); | 2803 | screen().changeWorkspaceID(new_id); |
2804 | 2804 | ||
2805 | m_last_resize_x = me.x_root + dx; | 2805 | m_last_resize_x = me.x_root + dx; |
@@ -2896,7 +2896,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2896 | // drag'n'drop code for tabs | 2896 | // drag'n'drop code for tabs |
2897 | // | 2897 | // |
2898 | FbTk::TextButton &active_button = *m_labelbuttons[(m_attaching_tab==0)?client:m_attaching_tab]; | 2898 | FbTk::TextButton &active_button = *m_labelbuttons[(m_attaching_tab==0)?client:m_attaching_tab]; |
2899 | ; | 2899 | |
2900 | if (m_attaching_tab == 0) { | 2900 | if (m_attaching_tab == 0) { |
2901 | if (s_num_grabs > 0) | 2901 | if (s_num_grabs > 0) |
2902 | return; | 2902 | return; |
@@ -3361,7 +3361,7 @@ void FluxboxWindow::doSnapping(int &orig_left, int &orig_top) { | |||
3361 | for (; it != it_end; it++) { | 3361 | for (; it != it_end; it++) { |
3362 | if ((*it) == this) | 3362 | if ((*it) == this) |
3363 | continue; // skip myself | 3363 | continue; // skip myself |
3364 | 3364 | ||
3365 | bw = (*it)->decorationMask() & DECORM_ENABLED ? (*it)->frame().window().borderWidth() : 0; | 3365 | bw = (*it)->decorationMask() & DECORM_ENABLED ? (*it)->frame().window().borderWidth() : 0; |
3366 | 3366 | ||
3367 | snapToWindow(dx, dy, left, right, top, bottom, | 3367 | snapToWindow(dx, dy, left, right, top, bottom, |
@@ -3486,12 +3486,11 @@ void FluxboxWindow::attachTo(int x, int y, bool interrupted) { | |||
3486 | if (client.m_win != 0) { | 3486 | if (client.m_win != 0) { |
3487 | client.m_win->move(frame().x() - m_last_resize_x + x, frame().y() - m_last_resize_y + y); | 3487 | client.m_win->move(frame().x() - m_last_resize_x + x, frame().y() - m_last_resize_y + y); |
3488 | client.m_win->show(); | 3488 | client.m_win->show(); |
3489 | } | 3489 | } |
3490 | } else if(attach_to_win==this && attach_to_win->isTabable()) { | ||
3491 | //reording of tabs within a frame | ||
3492 | moveClientTo(*old_attached, x, y); | ||
3490 | } | 3493 | } |
3491 | else if(attach_to_win==this && attach_to_win->isTabable()) { | ||
3492 | //reording of tabs within a frame | ||
3493 | moveClientTo(*old_attached, x, y); | ||
3494 | } | ||
3495 | 3494 | ||
3496 | } | 3495 | } |
3497 | } | 3496 | } |