Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-10-17 04:37:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-10-17 04:39:42 +0300
commit57ec19e0e5cbb96392eccf12d4ccc17c4cf9b65b (patch)
tree1365574ffd4aa1b3280e7e6964baa09d7887a215 /source/blender
parentd0f4d0df2aea12397a504f93b95e00d378da0b16 (diff)
WM: immediate line-gesture activation on tweak
Matches border-gesture behavior, needed for binding bisect to tweak event.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 9a1c01487b5..d783b5fd925 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2942,6 +2942,11 @@ int WM_gesture_straightline_invoke(bContext *C, wmOperator *op, const wmEvent *e
op->customdata = WM_gesture_new(C, event, WM_GESTURE_STRAIGHTLINE);
+ if (ISTWEAK(event->type)) {
+ wmGesture *gesture = op->customdata;
+ gesture->is_active = true;
+ }
+
/* add modal handler */
WM_event_add_modal_handler(C, op);
@@ -4416,7 +4421,7 @@ static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf)
WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_ANY, KM_ANY, 0, GESTURE_MODAL_CANCEL);
WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, 0, 0, GESTURE_MODAL_BEGIN);
- WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, 0, 0, GESTURE_MODAL_SELECT);
+ WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, GESTURE_MODAL_SELECT);
/* assign map to operators */
WM_modalkeymap_assign(keymap, "IMAGE_OT_sample_line");