diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-29 06:01:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-29 06:01:38 +0300 |
commit | 2f06a0b14b74c2aa089e8732d716b4dd6acbdd99 (patch) | |
tree | 9b59be5859f7938611d21d76349c802de05561c6 /source/blender/windowmanager/gizmo/WM_gizmo_api.h | |
parent | 2610845250b63f00f40dc98a70e462fea61341c1 (diff) |
Cleanup: move gizmo keymap access into funcitons
Existing functions were written to match the setup_keymap callback.
Add versions that can be called with the window manager for convenience.
Diffstat (limited to 'source/blender/windowmanager/gizmo/WM_gizmo_api.h')
-rw-r--r-- | source/blender/windowmanager/gizmo/WM_gizmo_api.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index bef3cd51aea..ea6fcee2299 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -46,6 +46,7 @@ struct wmGizmoType; struct wmKeyConfig; struct wmMsgSubscribeKey; struct wmMsgSubscribeValue; +struct wmWindowManager; #include "wm_gizmo_fn.h" @@ -235,21 +236,19 @@ void WM_gizmo_target_property_subscribe_all(struct wmGizmo *gz, /* wmGizmoGroup */ /* Callbacks for 'wmGizmoGroupType.setup_keymap' */ -struct wmKeyMap *WM_gizmogroup_keymap_template_ex(struct wmKeyConfig *config, - const char *idname, - const struct wmGizmoMapType_Params *params); -struct wmKeyMap *WM_gizmogroup_keymap_template(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *config); - -struct wmKeyMap *WM_gizmogroup_keymap_template_select_ex( - struct wmKeyConfig *config, const char *idname, const struct wmGizmoMapType_Params *params); -struct wmKeyMap *WM_gizmogroup_keymap_template_select(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *config); - struct wmKeyMap *WM_gizmogroup_keymap_generic(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *config); + struct wmKeyConfig *kc); struct wmKeyMap *WM_gizmogroup_keymap_generic_select(const struct wmGizmoGroupType *gzgt, - struct wmKeyConfig *config); + struct wmKeyConfig *kc); +/* Utility functions (not callbacks). */ +struct wmKeyMap *WM_gizmo_keymap_generic_with_keyconfig(struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmo_keymap_generic(struct wmWindowManager *wm); + +struct wmKeyMap *WM_gizmo_keymap_generic_select_with_keyconfig(struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmo_keymap_generic_select(struct wmWindowManager *wm); + +struct wmKeyMap *WM_gizmo_keymap_generic_click_drag_with_keyconfig(struct wmKeyConfig *kc); +struct wmKeyMap *WM_gizmo_keymap_generic_click_drag(struct wmWindowManager *wm); void WM_gizmogroup_ensure_init(const struct bContext *C, struct wmGizmoGroup *gzgroup); |