diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 09:06:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-04 09:06:38 +0400 |
commit | cd324bd43e1b78422b22558ee4fe9cc12f51098e (patch) | |
tree | 204398880674a49be0c304eb0be238654a6b9a88 /source/blender/editors/screen/screen_ops.c | |
parent | 064bf204f3b6d66c1c66a682c0281c062793d1fe (diff) |
fix for window join action being interpreted as a split.
The limit for dragging a gesture on an area corner was smaller then the area hot-spot,
so you could click on the right-most side of the bottom-left corner, drag left - pass the gesture threshold and still be in the same area. so a motion intended as a join would register as a split.
Happened more with high DPI values. fix by ensuring the drag limit is always higher then the hotspot.
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3066b733fc5..da7518f9e28 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -696,26 +696,29 @@ static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event) static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event) { sActionzoneData *sad = op->customdata; - int deltax, deltay; - int mindelta = sad->az->type == AZONE_REGION ? 1 : 12; switch (event->type) { case MOUSEMOVE: + { + /* for AZONE_AREA 'delta_min' uses (AZONESPOT + 1) dragging before a gesture is accepted. + * because the distance must be larger then the hot-spot else an intended join can turn into a split */ + const int delta_min = (sad->az->type == AZONE_AREA) ? (AZONESPOT + 1) : 1; + + const int delta_x = (event->x - sad->x); + const int delta_y = (event->y - sad->y); + /* calculate gesture direction */ - deltax = (event->x - sad->x); - deltay = (event->y - sad->y); - - if (deltay > ABS(deltax)) + if (delta_y > ABS(delta_x)) sad->gesture_dir = 'n'; - else if (deltax > ABS(deltay)) + else if (delta_x > ABS(delta_y)) sad->gesture_dir = 'e'; - else if (deltay < -ABS(deltax)) + else if (delta_y < -ABS(delta_x)) sad->gesture_dir = 's'; else sad->gesture_dir = 'w'; /* gesture is large enough? */ - if (ABS(deltax) > mindelta || ABS(deltay) > mindelta) { + if (ABS(delta_x) > delta_min || ABS(delta_y) > delta_min) { /* second area, for join */ sad->sa2 = screen_areahascursor(CTX_wm_screen(C), event->x, event->y); @@ -726,6 +729,7 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event) return OPERATOR_FINISHED; } break; + } case ESCKEY: actionzone_exit(op); return OPERATOR_CANCELLED; |