diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-21 15:35:02 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-21 15:53:42 +0300 |
| commit | d10f54ee753d3211f7b9b3c925545cd7525d571f (patch) | |
| tree | 041ed3701b0bc2da8e5258200a7e77a93f060e6b /source/blender/editors | |
| parent | 622c9ced6ca33ce2944b6795e6175a3f8c9e9365 (diff) | |
UI: Support UI operators with configurable shortcuts
After all a super simple solution that allows us to get rid of hardcoded keymap items.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 2 | ||||
| -rw-r--r-- | 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); } |