diff options
author | Campbell Barton <campbell@blender.org> | 2022-04-04 06:47:06 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-04-04 07:32:42 +0300 |
commit | f699dbba86156ad3f24c24e3d369f0708b3fd1b5 (patch) | |
tree | e244f3f17a5a2166d443d25c14abb915d316f1a2 /source/blender/windowmanager/gizmo | |
parent | 0ef96cd3922dbc16271f2dbaca0c7752db92a40d (diff) |
Cleanup: use event parameters for functions that create key-map items
Replace 5 arguments with a single struct as the same arguments
are used in many places.
This didn't read well and was confusing with both arguments named
`val` & `value` in the case of WM_modalkeymap_add_item.
Diffstat (limited to 'source/blender/windowmanager/gizmo')
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c | 162 |
1 files changed, 131 insertions, 31 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index d7b54129caa..4ecadbc5685 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -640,29 +640,105 @@ wmKeyMap *wm_gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf) keymap = WM_modalkeymap_ensure(keyconf, name, modal_items); /* items for modal map */ - WM_modalkeymap_add_item(keymap, EVT_ESCKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_CANCEL); - WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_CANCEL); - - WM_modalkeymap_add_item(keymap, EVT_RETKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_CONFIRM); - WM_modalkeymap_add_item(keymap, EVT_PADENTER, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_CONFIRM); - - WM_modalkeymap_add_item( - keymap, EVT_RIGHTSHIFTKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_PRECISION_ON); - WM_modalkeymap_add_item( - keymap, EVT_RIGHTSHIFTKEY, KM_RELEASE, KM_ANY, 0, KM_ANY, TWEAK_MODAL_PRECISION_OFF); - WM_modalkeymap_add_item( - keymap, EVT_LEFTSHIFTKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_PRECISION_ON); - WM_modalkeymap_add_item( - keymap, EVT_LEFTSHIFTKEY, KM_RELEASE, KM_ANY, 0, KM_ANY, TWEAK_MODAL_PRECISION_OFF); - - WM_modalkeymap_add_item( - keymap, EVT_RIGHTCTRLKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_SNAP_ON); - WM_modalkeymap_add_item( - keymap, EVT_RIGHTCTRLKEY, KM_RELEASE, KM_ANY, 0, KM_ANY, TWEAK_MODAL_SNAP_OFF); - WM_modalkeymap_add_item( - keymap, EVT_LEFTCTRLKEY, KM_PRESS, KM_ANY, 0, KM_ANY, TWEAK_MODAL_SNAP_ON); - WM_modalkeymap_add_item( - keymap, EVT_LEFTCTRLKEY, KM_RELEASE, KM_ANY, 0, KM_ANY, TWEAK_MODAL_SNAP_OFF); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_ESCKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_CANCEL); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = RIGHTMOUSE, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_CANCEL); + + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_RETKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_CONFIRM); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_PADENTER, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_CONFIRM); + + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_RIGHTSHIFTKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_PRECISION_ON); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_RIGHTSHIFTKEY, + .value = KM_RELEASE, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_PRECISION_OFF); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_LEFTSHIFTKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_PRECISION_ON); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_LEFTSHIFTKEY, + .value = KM_RELEASE, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_PRECISION_OFF); + + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_RIGHTCTRLKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_SNAP_ON); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_RIGHTCTRLKEY, + .value = KM_RELEASE, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_SNAP_OFF); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_LEFTCTRLKEY, + .value = KM_PRESS, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_SNAP_ON); + WM_modalkeymap_add_item(keymap, + &(const KeyMapItem_Params){ + .type = EVT_LEFTCTRLKEY, + .value = KM_RELEASE, + .modifier = KM_ANY, + .direction = KM_ANY, + }, + TWEAK_MODAL_SNAP_OFF); WM_modalkeymap_assign(keymap, "GIZMOGROUP_OT_gizmo_tweak"); @@ -720,20 +796,44 @@ static wmKeyMap *WM_gizmogroup_keymap_template_select_ex( #endif if (do_init) { - WM_keymap_add_item( - km, "GIZMOGROUP_OT_gizmo_tweak", action_mouse, action_mouse_val, KM_ANY, 0, KM_ANY); - WM_keymap_add_item( - km, "GIZMOGROUP_OT_gizmo_tweak", select_tweak, select_tweak_val, 0, 0, KM_ANY); + WM_keymap_add_item(km, + "GIZMOGROUP_OT_gizmo_tweak", + &(const KeyMapItem_Params){ + .type = action_mouse, + .value = action_mouse_val, + .modifier = KM_ANY, + .direction = KM_ANY, + }); + WM_keymap_add_item(km, + "GIZMOGROUP_OT_gizmo_tweak", + &(const KeyMapItem_Params){ + .type = select_tweak, + .value = select_tweak_val, + .modifier = 0, + .direction = KM_ANY, + }); } if (do_init) { - wmKeyMapItem *kmi = WM_keymap_add_item( - km, "GIZMOGROUP_OT_gizmo_select", select_mouse, select_mouse_val, 0, 0, KM_ANY); + wmKeyMapItem *kmi = WM_keymap_add_item(km, + "GIZMOGROUP_OT_gizmo_select", + &(const KeyMapItem_Params){ + .type = select_mouse, + .value = select_mouse_val, + .modifier = 0, + .direction = KM_ANY, + }); RNA_boolean_set(kmi->ptr, "extend", false); RNA_boolean_set(kmi->ptr, "deselect", false); RNA_boolean_set(kmi->ptr, "toggle", false); - kmi = WM_keymap_add_item( - km, "GIZMOGROUP_OT_gizmo_select", select_mouse, select_mouse_val, KM_SHIFT, 0, KM_ANY); + kmi = WM_keymap_add_item(km, + "GIZMOGROUP_OT_gizmo_select", + &(const KeyMapItem_Params){ + .type = select_mouse, + .value = select_mouse_val, + .modifier = KM_SHIFT, + .direction = KM_ANY, + }); RNA_boolean_set(kmi->ptr, "extend", false); RNA_boolean_set(kmi->ptr, "deselect", false); RNA_boolean_set(kmi->ptr, "toggle", true); |