griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Allow accessing modal keymap strings directly from keymap

Browse Source 
Previously you had to pass operator which in some cases might not be available or hard to get.
This commit is contained in:
Julian Eisel
2015-08-01 13:01:30 +02:00
parent 2904007d31
commit fa1945c9e5
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/WM_keymap.h
View File

@@ -82,6 +82,8 @@ int WM_keymap_item_compare(struct wmKeyMapItem *k1, struct wmKeyMapItem *k2);
/* Modal Keymap */
int WM_modalkeymap_items_to_string(
struct wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str);
int WM_modalkeymap_operator_items_to_string(
struct wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str);
char *WM_modalkeymap_operator_items_to_string_buf(

11
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -975,10 +975,9 @@ int WM_keymap_item_to_string(wmKeyMapItem *kmi, const bool compact, const int le
compact, len, r_str);
}
int WM_modalkeymap_operator_items_to_string(
wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str)
int WM_modalkeymap_items_to_string(
wmKeyMap *km, const int propvalue, const bool compact, const int len, char *r_str)
{
wmKeyMap *km = ot->modalkeymap;
int totlen = 0;
bool add_sep = false;
@@ -1004,6 +1003,12 @@ int WM_modalkeymap_operator_items_to_string(
return totlen;
}
int WM_modalkeymap_operator_items_to_string(
wmOperatorType *ot, const int propvalue, const bool compact, const int len, char *r_str)
{
return WM_modalkeymap_items_to_string(ot->modalkeymap, propvalue, compact, len, r_str);
}
char *WM_modalkeymap_operator_items_to_string_buf(
wmOperatorType *ot, const int propvalue, const bool compact,
const int max_len, int *r_available_len, char **r_str)