diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-10-22 17:14:10 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-10-22 17:14:10 -0400 |
commit | 8a57c48dffda7c49e59d1c56739f857c6f28b07d (patch) | |
tree | 6c3386583cec8ed0225b06b8e8f806761f0cbeb5 | |
parent | Move pointer during seamless transitions (diff) | |
parent | handlers: Fix swapped top/bottom for seamless transitions. (diff) | |
download | sway-8a57c48dffda7c49e59d1c56739f857c6f28b07d.tar.gz sway-8a57c48dffda7c49e59d1c56739f857c6f28b07d.tar.zst sway-8a57c48dffda7c49e59d1c56739f857c6f28b07d.zip |
Merge pull request #200 from sce/fix_seamless_transitions
handlers: Fix swapped top/bottom for seamless transitions.
-rw-r--r-- | sway/handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/handlers.c b/sway/handlers.c index 6d3f48aa..6120e663 100644 --- a/sway/handlers.c +++ b/sway/handlers.c | |||
@@ -398,7 +398,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
398 | if (output->x == c->x && c->y + c->height == output->y) { | 398 | if (output->x == c->x && c->y + c->height == output->y) { |
399 | sway_log(L_DEBUG, "%s is below %s", output->name, c->name); | 399 | sway_log(L_DEBUG, "%s is below %s", output->name, c->name); |
400 | workspace_switch(c); | 400 | workspace_switch(c); |
401 | new_origin.y = 0; | 401 | new_origin.y = c->height; |
402 | } | 402 | } |
403 | } | 403 | } |
404 | } else if ((double)origin->y == output->height) { // Bottom edge | 404 | } else if ((double)origin->y == output->height) { // Bottom edge |
@@ -410,7 +410,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct | |||
410 | if (output->x == c->x && output->y + output->height == c->y) { | 410 | if (output->x == c->x && output->y + output->height == c->y) { |
411 | sway_log(L_DEBUG, "%s is above %s", output->name, c->name); | 411 | sway_log(L_DEBUG, "%s is above %s", output->name, c->name); |
412 | workspace_switch(c); | 412 | workspace_switch(c); |
413 | new_origin.y = c->height; | 413 | new_origin.y = 0; |
414 | } | 414 | } |
415 | } | 415 | } |
416 | } | 416 | } |