diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-10-10 21:13:40 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-10-13 16:35:41 +0400 |
commit | 9fcc1a32df1377d22b950854fabc7af53a67b813 (patch) | |
tree | fb11bec4ed32bf7703fefad1551390f4c62ca280 /source/blender/windowmanager | |
parent | 116439ed91dd313fdc30c93b5d76807b7473ad39 (diff) |
Pie menus: Confirm threshold
This commit adds a confirm threshold property to pie menus.
Basically, this will confirm the pie menu automatically when
the distance from the center of the pie exceeds that threshold without
a need to release the pie button.
The confirm threshold will only work if it is larger than the pie
threshold.
The confirmation actually occur when the mouse stops moving, to
allow multiple pie menus to be better linked together, (see below)
This functionality also facilitates the ability for chained pie menus by
dragging. Basically, a pie menu item can be a call_menu_pie operator and
the new pie menu will still use the original pie menu release event for
confirmation. This should allow for quick, gesture based navigation in
pie menu hierarchies (going back in the hierarchy is still not supported
though)
There will be a demonstration pie in the official add-on soon
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 2f8ee1ca141..0218513c03f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2188,6 +2188,12 @@ static void wm_event_drag_test(wmWindowManager *wm, wmWindow *win, wmEvent *even } +static void wm_event_pie_filter(wmWindow *win, wmEvent *event) +{ + if (win->lock_pie_event == event->type && event->val == KM_RELEASE) + win->lock_pie_event = EVENT_NONE; +} + /* called in main loop */ /* goes over entire hierarchy: events -> window -> screen -> area -> region */ void wm_event_do_handlers(bContext *C) @@ -2263,6 +2269,9 @@ void wm_event_do_handlers(bContext *C) wm_region_mouse_co(C, event); + /* take care of pie event filter */ + wm_event_pie_filter(win, event); + /* first we do priority handlers, modal + some limited keymaps */ action |= wm_handlers_do(C, event, &win->modalhandlers); |