From d10f54ee753d3211f7b9b3c925545cd7525d571f Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Wed, 21 Sep 2016 14:35:02 +0200 Subject: UI: Support UI operators with configurable shortcuts After all a super simple solution that allows us to get rid of hardcoded keymap items. --- source/blender/editors/interface/interface_ops.c | 2 -- source/blender/editors/screen/area.c | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index cb539bb1c5d..43b48dbb953 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1185,8 +1185,6 @@ void ED_operatortypes_ui(void) /** * \brief User Interface Keymap - * - * For now only modal maps here, since UI uses special ui-handlers instead of operators. */ void ED_keymap_ui(wmKeyConfig *keyconf) { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 8d058ed2081..e6bb604d387 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1367,9 +1367,12 @@ static void region_subwindow(wmWindow *win, ARegion *ar, bool activate) static void ed_default_handlers(wmWindowManager *wm, ScrArea *sa, ListBase *handlers, int flag) { /* note, add-handler checks if it already exists */ - + /* XXX it would be good to have boundbox checks for some of these... */ if (flag & ED_KEYMAP_UI) { + wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "User Interface", 0, 0); + WM_event_add_keymap_handler(handlers, keymap); + /* user interface widgets */ UI_region_handlers_add(handlers); } -- cgit v1.2.3