[Bf-blender-cvs] [b87123cf2f2] master: Fix F-Key icon display

[Campbell Barton]

Commit: b87123cf2f2f24ae2c4a3f3e0f4443a0ad45338d
Author: Campbell Barton
Date:   Thu Oct 3 06:29:27 2019 +1000
Branches: master
https://developer.blender.org/rBb87123cf2f2f24ae2c4a3f3e0f4443a0ad45338d

Fix F-Key icon display

===================================================================

M	source/blender/editors/interface/interface_icons_event.c

===================================================================

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) {