diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-10-25 06:47:14 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-10-25 06:47:14 +0300 |
| commit | c90e05bb42668f0c99cf313b179c00a1380cb569 (patch) | |
| tree | fc2f61e3bb0f57ac7667f81e6033c2c6a93a4ea1 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 4815e07b6f59cb8f1a1f2490173480eff17974da (diff) | |
Toolbar Fixes:
* Restored the Grease Pencil tools to the toolbar
Probably, if the reason they were commented out before was so that the repeat stuff is visible, we can swap the order of those two. Otherwise, it's good to have somewhere for the operators now (so that the hotkeys can be found)
* Hotkey displays in the tooltips now show the keymodifier too
For example, "D LeftMouse" or "Ctrl D LeftMouse" for the Grease Pencil operators, instead of just "LeftMouse" or "Ctrl LeftMouse".
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 3caca041be7..48262e40ea7 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -306,6 +306,11 @@ char *WM_keymap_item_to_string(wmKeyMapItem *kmi, char *str, int len) if(kmi->oskey) strcat(buf, "Cmd "); + + if(kmi->keymodifier) { + strcat(buf, WM_key_event_string(kmi->keymodifier)); + strcat(buf, " "); + } strcat(buf, WM_key_event_string(kmi->type)); BLI_strncpy(str, buf, len); |