blender
/
blender
134
425
Fork 607
Code Issues 6.2k Pull Requests 778 Projects 19 Wiki Activity

UI: Complete Event Icon Coverage #120117

Merged
Harley Acheson merged 8 commits from Harley/blender:EventIconsComplete into main 2024-04-02 21:53:10 +02:00
Conversation 2 Commits 8 Files Changed 4 +152 -156
3 changed files with 152 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d8643f09d5 - Show all commits

68
source/blender/editors/include/UI_icons.hh
View File

@ -1001,17 +1001,6 @@ DEF_ICON_VECTOR(LIBRARY_DATA_OVERRIDE_NONEDITABLE)
/* Events. */
DEF_ICON_COLOR(EVENT_ZEROKEY)
DEF_ICON_COLOR(EVENT_ONEKEY)
DEF_ICON_COLOR(EVENT_TWOKEY)
DEF_ICON_COLOR(EVENT_THREEKEY)
DEF_ICON_COLOR(EVENT_FOURKEY)
DEF_ICON_COLOR(EVENT_FIVEKEY)
DEF_ICON_COLOR(EVENT_SIXKEY)
DEF_ICON_COLOR(EVENT_SEVENKEY)
DEF_ICON_COLOR(EVENT_EIGHTKEY)
DEF_ICON_COLOR(EVENT_NINEKEY)
DEF_ICON_COLOR(EVENT_A)
DEF_ICON_COLOR(EVENT_B)
DEF_ICON_COLOR(EVENT_C)
@ -1038,28 +1027,39 @@ DEF_ICON_COLOR(EVENT_W)
DEF_ICON_COLOR(EVENT_X)
DEF_ICON_COLOR(EVENT_Y)
DEF_ICON_COLOR(EVENT_Z)
DEF_ICON_COLOR(EVENT_SHIFT)
DEF_ICON_COLOR(EVENT_CTRL)
DEF_ICON_COLOR(EVENT_ALT)
DEF_ICON_COLOR(EVENT_OS)
DEF_ICON_COLOR(EVENT_F1)
DEF_ICON_COLOR(EVENT_F2)
DEF_ICON_COLOR(EVENT_F3)
DEF_ICON_COLOR(EVENT_F4)
DEF_ICON_COLOR(EVENT_F5)
DEF_ICON_COLOR(EVENT_F6)
DEF_ICON_COLOR(EVENT_F7)
DEF_ICON_COLOR(EVENT_F8)
DEF_ICON_COLOR(EVENT_F9)
DEF_ICON_COLOR(EVENT_F10)
DEF_ICON_COLOR(EVENT_F11)
DEF_ICON_COLOR(EVENT_F12)
DEF_ICON_COLOR(EVENT_ESC)
DEF_ICON_COLOR(EVENT_TAB)
DEF_ICON_COLOR(EVENT_PAGEUP)
DEF_ICON_COLOR(EVENT_PAGEDOWN)
DEF_ICON_COLOR(EVENT_RETURN)
DEF_ICON_COLOR(EVENT_SPACEKEY)
DEF_ICON_COLOR(EVENT_MOUSE_4)
DEF_ICON_COLOR(EVENT_MOUSE_5)
DEF_ICON_COLOR(EVENT_MOUSE_6)
DEF_ICON_COLOR(EVENT_MOUSE_7)
DEF_ICON_COLOR(EVENT_TABLET_STYLUS)
DEF_ICON_COLOR(EVENT_TABLET_ERASER)
DEF_ICON_COLOR(EVENT_LEFT_ARROW)
DEF_ICON_COLOR(EVENT_DOWN_ARROW)
DEF_ICON_COLOR(EVENT_RIGHT_ARROW)
DEF_ICON_COLOR(EVENT_UP_ARROW)
DEF_ICON_COLOR(EVENT_ZEROKEY)
DEF_ICON_COLOR(EVENT_ONEKEY)
DEF_ICON_COLOR(EVENT_TWOKEY)
DEF_ICON_COLOR(EVENT_THREEKEY)
DEF_ICON_COLOR(EVENT_FOURKEY)
DEF_ICON_COLOR(EVENT_FIVEKEY)
DEF_ICON_COLOR(EVENT_SIXKEY)
DEF_ICON_COLOR(EVENT_SEVENKEY)
DEF_ICON_COLOR(EVENT_EIGHTKEY)
DEF_ICON_COLOR(EVENT_NINEKEY)
DEF_ICON_COLOR(EVENT_PAD0)
DEF_ICON_COLOR(EVENT_PAD1)
@ -1078,6 +1078,16 @@ DEF_ICON_COLOR(EVENT_PADENTER)
DEF_ICON_COLOR(EVENT_PADPLUS)
DEF_ICON_COLOR(EVENT_PADPERIOD)
DEF_ICON_COLOR(EVENT_MOUSE_4)
DEF_ICON_COLOR(EVENT_MOUSE_5)
DEF_ICON_COLOR(EVENT_MOUSE_6)
DEF_ICON_COLOR(EVENT_MOUSE_7)
DEF_ICON_COLOR(EVENT_TABLET_STYLUS)
DEF_ICON_COLOR(EVENT_TABLET_ERASER)
DEF_ICON_COLOR(EVENT_LEFT_ARROW)
DEF_ICON_COLOR(EVENT_DOWN_ARROW)
DEF_ICON_COLOR(EVENT_RIGHT_ARROW)
DEF_ICON_COLOR(EVENT_UP_ARROW)
DEF_ICON_COLOR(EVENT_PAUSE)
DEF_ICON_COLOR(EVENT_INSERT)
DEF_ICON_COLOR(EVENT_HOME)
@ -1105,18 +1115,6 @@ DEF_ICON_COLOR(EVENT_EQUAL)
DEF_ICON_COLOR(EVENT_LEFTBRACKET)
DEF_ICON_COLOR(EVENT_RIGHTBRACKET)
DEF_ICON_COLOR(EVENT_F1)
DEF_ICON_COLOR(EVENT_F2)
DEF_ICON_COLOR(EVENT_F3)
DEF_ICON_COLOR(EVENT_F4)
DEF_ICON_COLOR(EVENT_F5)
DEF_ICON_COLOR(EVENT_F6)
DEF_ICON_COLOR(EVENT_F7)
DEF_ICON_COLOR(EVENT_F8)
DEF_ICON_COLOR(EVENT_F9)
DEF_ICON_COLOR(EVENT_F10)
DEF_ICON_COLOR(EVENT_F11)
DEF_ICON_COLOR(EVENT_F12)
DEF_ICON_COLOR(EVENT_F13)
DEF_ICON_COLOR(EVENT_F14)
DEF_ICON_COLOR(EVENT_F15)

68
source/blender/editors/interface/interface_icons.cc
View File

@ -694,17 +694,6 @@ static void init_event_icons()
const int w = 16; /* DUMMY */
INIT_EVENT_ICON(ICON_EVENT_ZEROKEY, EVT_ZEROKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_ONEKEY, EVT_ONEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TWOKEY, EVT_TWOKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_THREEKEY, EVT_THREEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_FOURKEY, EVT_FOURKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_FIVEKEY, EVT_FIVEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SIXKEY, EVT_SIXKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SEVENKEY, EVT_SEVENKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_EIGHTKEY, EVT_EIGHTKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_NINEKEY, EVT_NINEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_A, EVT_AKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_B, EVT_BKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_C, EVT_CKEY, KM_ANY);
@ -731,28 +720,39 @@ static void init_event_icons()
INIT_EVENT_ICON(ICON_EVENT_X, EVT_XKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_Y, EVT_YKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_Z, EVT_ZKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SHIFT, EVT_LEFTSHIFTKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_CTRL, EVT_LEFTCTRLKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_ALT, EVT_LEFTALTKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_OS, EVT_OSKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F1, EVT_F1KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F2, EVT_F2KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F3, EVT_F3KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F4, EVT_F4KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F5, EVT_F5KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F6, EVT_F6KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F7, EVT_F7KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F8, EVT_F8KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F9, EVT_F9KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F10, EVT_F10KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F11, EVT_F11KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F12, EVT_F12KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_ESC, EVT_ESCKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TAB, EVT_TABKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PAGEUP, EVT_PAGEUPKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PAGEDOWN, EVT_PAGEDOWNKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_RETURN, EVT_RETKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SPACEKEY, EVT_SPACEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_4, BUTTON4MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_5, BUTTON5MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_6, BUTTON6MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_7, BUTTON7MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TABLET_STYLUS, TABLET_STYLUS, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TABLET_ERASER, TABLET_ERASER, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_LEFT_ARROW, EVT_LEFTARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_DOWN_ARROW, EVT_DOWNARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_RIGHT_ARROW, EVT_RIGHTARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_UP_ARROW, EVT_UPARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_ZEROKEY, EVT_ZEROKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_ONEKEY, EVT_ONEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TWOKEY, EVT_TWOKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_THREEKEY, EVT_THREEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_FOURKEY, EVT_FOURKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_FIVEKEY, EVT_FIVEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SIXKEY, EVT_SIXKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_SEVENKEY, EVT_SEVENKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_EIGHTKEY, EVT_EIGHTKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_NINEKEY, EVT_NINEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PAD0, EVT_PAD0, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PAD1, EVT_PAD1, KM_ANY);
@ -771,6 +771,16 @@ static void init_event_icons()
INIT_EVENT_ICON(ICON_EVENT_PADPLUS, EVT_PADPLUSKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PADPERIOD, EVT_PADPERIOD, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_4, BUTTON4MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_5, BUTTON5MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_6, BUTTON6MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_MOUSE_7, BUTTON7MOUSE, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TABLET_STYLUS, TABLET_STYLUS, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_TABLET_ERASER, TABLET_ERASER, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_LEFT_ARROW, EVT_LEFTARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_DOWN_ARROW, EVT_DOWNARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_RIGHT_ARROW, EVT_RIGHTARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_UP_ARROW, EVT_UPARROWKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_PAUSE, EVT_PAUSEKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_INSERT, EVT_INSERTKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_HOME, EVT_HOMEKEY, KM_ANY);
@ -798,18 +808,6 @@ static void init_event_icons()
INIT_EVENT_ICON(ICON_EVENT_LEFTBRACKET, EVT_LEFTBRACKETKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_RIGHTBRACKET, EVT_RIGHTBRACKETKEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F1, EVT_F1KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F2, EVT_F2KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F3, EVT_F3KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F4, EVT_F4KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F5, EVT_F5KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F6, EVT_F6KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F7, EVT_F7KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F8, EVT_F8KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F9, EVT_F9KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F10, EVT_F10KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F11, EVT_F11KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F12, EVT_F12KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F13, EVT_F13KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F14, EVT_F14KEY, KM_ANY);
INIT_EVENT_ICON(ICON_EVENT_F15, EVT_F15KEY, KM_ANY);

172
source/blender/editors/interface/interface_icons_event.cc
View File

@ -68,7 +68,92 @@ void icon_draw_rect_input(
#endif
;
if ((event_type == BUTTON4MOUSE)) {
if ((event_type >= EVT_AKEY) && (event_type <= EVT_ZKEY)) {
const char str[2] = { char('A' + (event_type - EVT_AKEY)), '\0' };
icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f);
}
else if ((event_type >= EVT_F1KEY) && (event_type <= EVT_F24KEY)) {
char str[4];
SNPRINTF(str, "F%d", 1 + (event_type - EVT_F1KEY));
icon_draw_rect_input_text(&rect, color, str, event_type > EVT_F9KEY ? 8.5f : 11.5f, 0.0f);
}
else if (event_type == EVT_LEFTSHIFTKEY) { /* Right Shift has already been converted to left. */
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_WHITE_ARROW, 14.0f, 0.0f);
}
else if (event_type == EVT_LEFTCTRLKEY) {/* Right Ctrl has already been converted to left. */
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UP_ARROWHEAD, 21.0f, -8.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Ctrl", 9.0f, 0.0f);
}
}
else if (event_type == EVT_LEFTALTKEY) { /* Right Alt has already been converted to left. */
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_OPTION_KEY, 13.0f, 0.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Alt", 11.0f, 0.0f);
}
}
else if (event_type == EVT_OSKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_PLACE_OF_INTEREST_SIGN, 13.0f, 0.0f);
}
else if (platform == MSWIN) {
icon_draw_rect_input_text(
&rect, color, BLI_STR_UTF8_BLACK_DIAMOND_MINUS_WHITE_X, 12.0f, 1.5f);
}
else {
icon_draw_rect_input_text(&rect, color, "OS", 10.0f, 0.0f);
}
}
else if (event_type == EVT_DELKEY) {
icon_draw_rect_input_text(&rect, color, "Del", 9.0f, 0.0f);
}
else if (event_type == EVT_TABKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_HORIZONTAL_TAB_KEY, 18.0f, -1.5f);
}
else if (event_type == EVT_HOMEKEY) {
icon_draw_rect_input_text(&rect, color, "Home", 5.5f, 0.0f);
}
else if (event_type == EVT_ENDKEY) {
icon_draw_rect_input_text(&rect, color, "End", 8.0f, 0.0f);
}
else if (event_type == EVT_RETKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_RETURN_SYMBOL, 16.0f, -2.0f);
}
else if (event_type == EVT_ESCKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(
&rect, color, BLI_STR_UTF8_BROKEN_CIRCLE_WITH_NORTHWEST_ARROW, 16.0f, 0.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Esc", 9.0f, 0.0f);
}
}
else if (event_type == EVT_PAGEUPKEY) {
icon_draw_rect_input_text(&rect, color, "P" BLI_STR_UTF8_UPWARDS_ARROW, 10.0f, 0.0f);
}
else if (event_type == EVT_PAGEDOWNKEY) {
icon_draw_rect_input_text(&rect, color, "P" BLI_STR_UTF8_DOWNWARDS_ARROW, 10.0f, 0.0f);
}
else if (event_type == EVT_LEFTARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_LEFTWARDS_ARROW, 18.0f, 0.0f);
}
else if (event_type == EVT_UPARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_ARROW, 16.0f, 0.0f);
}
else if (event_type == EVT_RIGHTARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_RIGHTWARDS_ARROW, 18.0f, 0.0f);
}
else if (event_type == EVT_DOWNARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_DOWNWARDS_ARROW, 16.0f, 0.0f);
}
else if (event_type == EVT_SPACEKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_OPEN_BOX, 20.0f, 2.0f);
}
else if ((event_type == BUTTON4MOUSE)) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_BLACK_VERTICAL_ELLIPSE "4", 12.0f, 0.0f);
}
else if ((event_type == BUTTON5MOUSE)) {
@ -90,22 +175,6 @@ void icon_draw_rect_input(
const char str[2] = {char('0' + (event_type - EVT_ZEROKEY)), '\0'};
icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f);
}
else if ((event_type >= EVT_AKEY) && (event_type <= EVT_ZKEY)) {
const char str[2] = {char('A' + (event_type - EVT_AKEY)), '\0'};
icon_draw_rect_input_text(&rect, color, str, 13.0f, 0.0f);
}
else if (event_type == EVT_LEFTARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_LEFTWARDS_ARROW, 18.0f, 0.0f);
}
else if (event_type == EVT_DOWNARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_DOWNWARDS_ARROW, 16.0f, 0.0f);
}
else if (event_type == EVT_RIGHTARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_RIGHTWARDS_ARROW, 18.0f, 0.0f);
}
else if (event_type == EVT_UPARROWKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_ARROW, 16.0f, 0.0f);
}
else if ((event_type >= EVT_PAD0) && (event_type <= EVT_PAD9)) {
char str[5];
SNPRINTF(str, "%s%i", BLI_STR_UTF8_SQUARE_WITH_ORTHOGONAL_CROSSHATCH, event_type - EVT_PAD0);
@ -141,33 +210,9 @@ void icon_draw_rect_input(
else if ((event_type == EVT_INSERTKEY)) {
icon_draw_rect_input_text(&rect, color, "Insert", 5.5f, 0.0f);
}
else if (event_type == EVT_HOMEKEY) {
icon_draw_rect_input_text(&rect, color, "Home", 5.5f, 0.0f);
Harley marked this conversation as resolved Outdated
Hans Goudey commented 2024-04-02 19:52:03 +02:00
Outdated
Review
Copy Link

I'm probably missing something, but is there any chance the new order could be rearranged so it's the same as the old order in more cases? That would just make the diff clearer.

I'm probably missing something, but is there any chance the new order could be rearranged so it's the same as the old order in more cases? That would just make the diff clearer.
}
else if (event_type == EVT_PAGEUPKEY) {
icon_draw_rect_input_text(&rect, color, "P" BLI_STR_UTF8_UPWARDS_ARROW, 10.0f, 0.0f);
}
else if (event_type == EVT_PAGEDOWNKEY) {
icon_draw_rect_input_text(&rect, color, "P" BLI_STR_UTF8_DOWNWARDS_ARROW, 10.0f, 0.0f);
}
else if (event_type == EVT_ENDKEY) {
icon_draw_rect_input_text(&rect, color, "End", 8.0f, 0.0f);
}
else if (event_type == EVT_UNKNOWNKEY) {
icon_draw_rect_input_text(&rect, color, " ", 12.0f, 0.0f);
}
else if (event_type == EVT_OSKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_PLACE_OF_INTEREST_SIGN, 13.0f, 0.0f);
}
else if (platform == MSWIN) {
icon_draw_rect_input_text(
&rect, color, BLI_STR_UTF8_BLACK_DIAMOND_MINUS_WHITE_X, 12.0f, 1.5f);
}
else {
icon_draw_rect_input_text(&rect, color, "OS", 10.0f, 0.0f);
}
}
else if (event_type == EVT_GRLESSKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_GREATER_THAN_OR_LESS_THAN, 16.0f, 0.0f);
}
@ -205,43 +250,6 @@ void icon_draw_rect_input(
else if (event_type == EVT_CAPSLOCKKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_UP_ARROW_FROM_BAR, 14.0f, 2.0f);
}
else if (event_type == EVT_LEFTCTRLKEY || event_type == EVT_RIGHTCTRLKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UP_ARROWHEAD, 21.0f, -8.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Ctrl", 9.0f, 0.0f);
}
}
else if (event_type == EVT_LEFTALTKEY || event_type == EVT_RIGHTALTKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_OPTION_KEY, 13.0f, 0.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Alt", 11.0f, 0.0f);
}
}
else if (event_type == EVT_LEFTSHIFTKEY || event_type == EVT_RIGHTSHIFTKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_UPWARDS_WHITE_ARROW, 14.0f, 0.0f);
}
else if (event_type == EVT_ESCKEY) {
if (platform == MACOS) {
icon_draw_rect_input_text(
&rect, color, BLI_STR_UTF8_BROKEN_CIRCLE_WITH_NORTHWEST_ARROW, 16.0f, 0.0f);
}
else {
icon_draw_rect_input_text(&rect, color, "Esc", 9.0f, 0.0f);
}
}
else if (event_type == EVT_TABKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_HORIZONTAL_TAB_KEY, 18.0f, -1.5f);
}
else if (event_type == EVT_RETKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_RETURN_SYMBOL, 16.0f, -2.0f);
}
else if (event_type == EVT_SPACEKEY) {
icon_draw_rect_input_text(&rect, color, BLI_STR_UTF8_OPEN_BOX, 20.0f, 2.0f);
}
else if (event_type == EVT_LINEFEEDKEY) {
icon_draw_rect_input_text(&rect, color, "LF", 12.0f, 0.0f);
}
@ -249,9 +257,6 @@ void icon_draw_rect_input(
const char str[] = BLI_STR_UTF8_ERASE_TO_THE_LEFT;
icon_draw_rect_input_text(&rect, color, str, 14.0f, 0.0f);
}
else if (event_type == EVT_DELKEY) {
icon_draw_rect_input_text(&rect, color, "Del", 9.0f, 0.0f);
}
else if (event_type == EVT_SEMICOLONKEY) {
icon_draw_rect_input_text(&rect, color, ";", 16.0f, 1.5f);
}
@ -288,11 +293,6 @@ void icon_draw_rect_input(
else if (event_type == EVT_RIGHTBRACKETKEY) {
icon_draw_rect_input_text(&rect, color, "]", 12.0f, 1.5f);
}
else if ((event_type >= EVT_F1KEY) && (event_type <= EVT_F24KEY)) {
char str[4];
SNPRINTF(str, "F%d", 1 + (event_type - EVT_F1KEY));
icon_draw_rect_input_text(&rect, color, str, event_type > EVT_F9KEY ? 8.5f : 11.5f, 0.0f);
}
else if ((event_type >= NDOF_BUTTON_MENU) && (event_type <= NDOF_BUTTON_C)) {
if ((event_type >= NDOF_BUTTON_V1) && (event_type <= NDOF_BUTTON_V3)) {
char str[7];