diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-27 07:08:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-27 07:10:33 +0300 |
commit | 46d9c5de84bceca921153f96c0b18f7f0b603ac7 (patch) | |
tree | ed039fc44bfaafb95a366b04129884e0f9eb3b2c /source/blender/windowmanager | |
parent | de09366d573d36ac96fa7dd9a20e87b6fad5ba02 (diff) |
WM: handle widgets before tool keymaps
Allows adjusting on-screen widgets even when a tool is selected.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 1230f264b2c..aa8180a7df6 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2755,7 +2755,13 @@ void wm_event_do_handlers(bContext *C) C, workspace->tool.keymap, sa->spacetype, RGN_TYPE_WINDOW); if (km != NULL) { sneaky_handler.keymap = km; - BLI_addhead(&ar->handlers, &sneaky_handler); + /* Handle widgets first. */ + wmEventHandler *handler_last = ar->handlers.last; + while (handler_last && handler_last->manipulator_map == NULL) { + handler_last = handler_last->prev; + } + /* Head of list or after last manipulator. */ + BLI_insertlinkafter(&ar->handlers, handler_last, &sneaky_handler); } } } |