archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use event parameters for functions that create key-map items

Browse Source 
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.
This commit is contained in:
Campbell Barton
2022-04-04 13:47:06 +10:00
parent 0ef96cd392
commit f699dbba86
11 changed files with 397 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/windowmanager/intern/wm_keymap_utils.c
View File

@@ -31,42 +31,27 @@
wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap,
const char *idname,
int type,
int val,
int modifier,
int keymodifier,
int direction)
const KeyMapItem_Params *params)
{
wmKeyMapItem *kmi = WM_keymap_add_item(
keymap, "WM_OT_call_menu", type, val, modifier, keymodifier, direction);
wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu", params);
RNA_string_set(kmi->ptr, "name", idname);
return kmi;
}
wmKeyMapItem *WM_keymap_add_menu_pie(wmKeyMap *keymap,
const char *idname,
int type,
int val,
int modifier,
int keymodifier,
int direction)
const KeyMapItem_Params *params)
{
wmKeyMapItem *kmi = WM_keymap_add_item(
keymap, "WM_OT_call_menu_pie", type, val, modifier, keymodifier, direction);
wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu_pie", params);
RNA_string_set(kmi->ptr, "name", idname);
return kmi;
}
wmKeyMapItem *WM_keymap_add_panel(wmKeyMap *keymap,
const char *idname,
int type,
int val,
int modifier,
int keymodifier,
int direction)
const KeyMapItem_Params *params)
{
wmKeyMapItem *kmi = WM_keymap_add_item(
keymap, "WM_OT_call_panel", type, val, modifier, keymodifier, direction);
wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_panel", params);
RNA_string_set(kmi->ptr, "name", idname);
/* TODO: we might want to disable this. */
RNA_boolean_set(kmi->ptr, "keep_open", false);
@@ -75,14 +60,9 @@ wmKeyMapItem *WM_keymap_add_panel(wmKeyMap *keymap,
wmKeyMapItem *WM_keymap_add_tool(wmKeyMap *keymap,
const char *idname,
int type,
int val,
int modifier,
int keymodifier,
int direction)
const KeyMapItem_Params *params)
{
wmKeyMapItem *kmi = WM_keymap_add_item(
keymap, "WM_OT_tool_set_by_id", type, val, modifier, keymodifier, direction);
wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_tool_set_by_id", params);
RNA_string_set(kmi->ptr, "name", idname);
return kmi;
}