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

fixed a minor issue with outline workspace movment

Browse source
This commit is contained in:
fluxgen 2002-08-31 10:52:30 +00:00
parent a8a5559b21
commit 91ee94f269
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.74 2002/08/30 16:07:17 fluxgen Exp $ // $Id: Window.cc,v 1.75 2002/08/31 10:52:30 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -3263,8 +3263,12 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
else if (dby > 0 && dby < screen->getEdgeSnapThreshold()) else if (dby > 0 && dby < screen->getEdgeSnapThreshold())
dy = dbby - frame.snap_h; dy = dbby - frame.snap_h;
} }
// Warp to next or previous workspace? // Warp to next or previous workspace?, must have moved sideways some
if (screen->isWorkspaceWarping()) { int moved_x=me->x_root - frame.resize_x;
// save last event point
frame.resize_x = me->x_root;
frame.resize_y = me->y_root;
if (moved_x && screen->isWorkspaceWarping()) {
int cur_id = screen->getCurrentWorkspaceID(); int cur_id = screen->getCurrentWorkspaceID();
int new_id = cur_id; int new_id = cur_id;
const int warpPad = screen->getEdgeSnapThreshold(); const int warpPad = screen->getEdgeSnapThreshold();
@ -3277,13 +3281,14 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
frame.x > int(me->x_root - frame.grab_x - screen->getBorderWidth())) { frame.x > int(me->x_root - frame.grab_x - screen->getBorderWidth())) {
//warp left //warp left
new_id = (cur_id - 1 + screen->getCount()) % screen->getCount(); new_id = (cur_id - 1 + screen->getCount()) % screen->getCount();
dx = screen->getWidth() - me->x_root; dx = screen->getWidth() - me->x_root-1;
} }
if (new_id != cur_id) { if (new_id != cur_id) {
XWarpPointer(display, None, None, 0, 0, 0, 0, dx, 0); XWarpPointer(display, None, None, 0, 0, 0, 0, dx, 0);
screen->changeWorkspaceID(new_id); screen->changeWorkspaceID(new_id);
frame.resize_x = me->x_root+dx;
if (!screen->doOpaqueMove()) { if (!screen->doOpaqueMove()) {
dx += frame.move_x; // for rectangle in correct position dx += frame.move_x; // for rectangle in correct position
} else { } else {