diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-02 23:29:27 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-03 00:32:28 +0300 |
commit | b87123cf2f2f24ae2c4a3f3e0f4443a0ad45338d (patch) | |
tree | 1e952c3f8e3855f3e0ec3ccc16ccd35a63819769 /source/blender/editors | |
parent | fb9024bdedacda7ea214cf68e72947adc6b56ac6 (diff) |
Fix F-Key icon display
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_icons_event.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_icons_event.c b/source/blender/editors/interface/interface_icons_event.c index e1ce77b8b61..6abb3cc72c2 100644 --- a/source/blender/editors/interface/interface_icons_event.c +++ b/source/blender/editors/interface/interface_icons_event.c @@ -171,12 +171,13 @@ void icon_draw_rect_input(float x, const bool simple_text = false; - if ((event_type >= AKEY) || (ZKEY <= event_type)) { + if ((event_type >= AKEY) && (ZKEY <= event_type)) { char str[2] = {'A' + (event_type - AKEY), '\0'}; icon_draw_rect_input_default_text(&rect, color, margin, str); } - if ((event_type >= F1KEY) || (F12KEY <= event_type)) { - char str[3] = {'F', '1' + (event_type - F1KEY), '\0'}; + else if ((event_type >= F1KEY) && (F12KEY <= event_type)) { + char str[4]; + SNPRINTF(str, "F%d", 1 + (event_type - F1KEY)); icon_draw_rect_input_default_text(&rect, color, margin, str); } else if (event_type == LEFTSHIFTKEY) { |