WM: handle widgets before tool keymaps

Allows adjusting on-screen widgets even when a tool is selected.

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);
 											}
 										}
 									}