Skip to content

Commit 359fe17

Browse files
sadiuksadiuk
committed
Added missing keys
1 parent 0088716 commit 359fe17

File tree

2 files changed

+72
-44
lines changed

2 files changed

+72
-44
lines changed

‎include/nbl/ui/KeyCodes.h

Lines changed: 59 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@ namespace nbl::ui
3939
EKC_RIGHT_WIN,
4040
EKC_APPS,
4141

42-
EKC_SEPARATOR,
42+
EKC_COMMA,
43+
EKC_PERIOD,
44+
EKC_SEMICOLON,
45+
EKC_OPEN_BRACKET,
46+
EKC_CLOSE_BRACKET,
47+
EKC_BACKSLASH,
48+
EKC_APOSTROPHE,
49+
4350
EKC_ADD = '+',
4451
EKC_SUBTRACT = '-',
4552
EKC_MULTIPLY = '*',
@@ -126,6 +133,7 @@ namespace nbl::ui
126133
EKC_VOLUME_UP,
127134
EKC_VOLUME_DOWN,
128135

136+
129137
EKC_COUNT,
130138
};
131139

@@ -135,56 +143,67 @@ namespace nbl::ui
135143
switch (code)
136144
{
137145
case EKC_0: [[fallthrough]];
138-
case EKC_NUMPAD_0: result = '0';
146+
case EKC_NUMPAD_0: result = '0'; break;
139147
case EKC_1: [[fallthrough]];
140-
case EKC_NUMPAD_1: result = '1';
148+
case EKC_NUMPAD_1: result = '1'; break;
141149
case EKC_2: [[fallthrough]];
142-
case EKC_NUMPAD_2: result = '2';
150+
case EKC_NUMPAD_2: result = '2'; break;
143151
case EKC_3: [[fallthrough]];
144-
case EKC_NUMPAD_3: result = '3';
152+
case EKC_NUMPAD_3: result = '3'; break;
145153
case EKC_4: [[fallthrough]];
146-
case EKC_NUMPAD_4: result = '4';
154+
case EKC_NUMPAD_4: result = '4'; break;
147155
case EKC_5: [[fallthrough]];
148-
case EKC_NUMPAD_5: result = '5';
156+
case EKC_NUMPAD_5: result = '5'; break;
149157
case EKC_6: [[fallthrough]];
150-
case EKC_NUMPAD_6: result = '6';
158+
case EKC_NUMPAD_6: result = '6'; break;
151159
case EKC_7: [[fallthrough]];
152-
case EKC_NUMPAD_7: result = '7';
160+
case EKC_NUMPAD_7: result = '7'; break;
153161
case EKC_8: [[fallthrough]];
154-
case EKC_NUMPAD_8: result = '8';
162+
case EKC_NUMPAD_8: result = '8'; break;
155163
case EKC_9: [[fallthrough]];
156-
case EKC_NUMPAD_9: result = '9';
164+
case EKC_NUMPAD_9: result = '9'; break;
157165

158-
case EKC_A: result = 'a';
159-
case EKC_B: result = 'b';
160-
case EKC_C: result = 'c';
161-
case EKC_D: result = 'd';
162-
case EKC_E: result = 'e';
163-
case EKC_F: result = 'f';
164-
case EKC_G: result = 'g';
165-
case EKC_H: result = 'h';
166-
case EKC_I: result = 'i';
167-
case EKC_J: result = 'j';
168-
case EKC_K: result = 'k';
169-
case EKC_L: result = 'l';
170-
case EKC_M: result = 'm';
171-
case EKC_N: result = 'n';
172-
case EKC_O: result = 'o';
173-
case EKC_P: result = 'p';
174-
case EKC_Q: result = 'q';
175-
case EKC_R: result = 'r';
176-
case EKC_S: result = 's';
177-
case EKC_T: result = 't';
178-
case EKC_U: result = 'u';
179-
case EKC_V: result = 'v';
180-
case EKC_W: result = 'w';
181-
case EKC_X: result = 'x';
182-
case EKC_Y: result = 'y';
183-
case EKC_Z: result = 'x';
166+
case EKC_A: result = 'a'; break;
167+
case EKC_B: result = 'b'; break;
168+
case EKC_C: result = 'c'; break;
169+
case EKC_D: result = 'd'; break;
170+
case EKC_E: result = 'e'; break;
171+
case EKC_F: result = 'f'; break;
172+
case EKC_G: result = 'g'; break;
173+
case EKC_H: result = 'h'; break;
174+
case EKC_I: result = 'i'; break;
175+
case EKC_J: result = 'j'; break;
176+
case EKC_K: result = 'k'; break;
177+
case EKC_L: result = 'l'; break;
178+
case EKC_M: result = 'm'; break;
179+
case EKC_N: result = 'n'; break;
180+
case EKC_O: result = 'o'; break;
181+
case EKC_P: result = 'p'; break;
182+
case EKC_Q: result = 'q'; break;
183+
case EKC_R: result = 'r'; break;
184+
case EKC_S: result = 's'; break;
185+
case EKC_T: result = 't'; break;
186+
case EKC_U: result = 'u'; break;
187+
case EKC_V: result = 'v'; break;
188+
case EKC_W: result = 'w'; break;
189+
case EKC_X: result = 'x'; break;
190+
case EKC_Y: result = 'y'; break;
191+
case EKC_Z: result = 'z'; break;
184192

185-
case EKC_TAB: result = '\t';
186-
case EKC_ENTER: result = '\n';
187-
case EKC_SPACE: result = ' ';
193+
case EKC_TAB: result = '\t'; break;
194+
case EKC_ENTER: result = '\n'; break;
195+
case EKC_SPACE: result = ' '; break;
196+
case EKC_COMMA: result = ','; break;
197+
case EKC_PERIOD: result = '.'; break;
198+
case EKC_SEMICOLON: result = ';'; break;
199+
case EKC_ADD: result = '+'; break;
200+
case EKC_SUBTRACT: result = '-'; break;
201+
case EKC_MULTIPLY: result = '*'; break;
202+
case EKC_DIVIDE: result = '/'; break;
203+
case EKC_OPEN_BRACKET: result = '['; break;
204+
case EKC_CLOSE_BRACKET: result = ']'; break;
205+
case EKC_BACKSLASH: result = '\\'; break;
206+
case EKC_APOSTROPHE: result = '\''; break;
188207
}
189208
return result;
190209
}

‎src/nbl/ui/CWindowWin32.cpp

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,11 +475,20 @@ namespace nbl::ui
475475
case VK_LWIN: nablaKeyCode = EKC_LEFT_WIN; break;
476476
case VK_RWIN: nablaKeyCode = EKC_RIGHT_WIN; break;
477477
case VK_APPS: nablaKeyCode = EKC_APPS; break;
478-
case VK_ADD: nablaKeyCode = EKC_ADD; break;
479-
case VK_SUBTRACT: nablaKeyCode = EKC_SUBTRACT; break;
478+
case VK_ADD:
479+
case VK_OEM_PLUS: nablaKeyCode = EKC_ADD; break;
480+
case VK_OEM_1: nablaKeyCode = EKC_SEMICOLON; break;
481+
case VK_OEM_4: nablaKeyCode = EKC_OPEN_BRACKET; break;
482+
case VK_OEM_5: nablaKeyCode = EKC_BACKSLASH; break;
483+
case VK_OEM_6: nablaKeyCode = EKC_CLOSE_BRACKET; break;
484+
case VK_OEM_7: nablaKeyCode = EKC_APOSTROPHE; break;
485+
case VK_SUBTRACT:
486+
case VK_OEM_MINUS: nablaKeyCode = EKC_SUBTRACT; break;
480487
case VK_MULTIPLY: nablaKeyCode = EKC_MULTIPLY; break;
481-
case VK_DIVIDE: nablaKeyCode = EKC_DIVIDE; break;
482-
case VK_SEPARATOR: nablaKeyCode = EKC_SEPARATOR; break;
488+
case VK_OEM_2: nablaKeyCode = EKC_DIVIDE; break;
489+
case VK_SEPARATOR: [[fallthrough]];
490+
case VK_OEM_COMMA: nablaKeyCode = EKC_COMMA; break;
491+
case VK_OEM_PERIOD: nablaKeyCode = EKC_PERIOD; break;
483492
case VK_NUMLOCK: nablaKeyCode = EKC_NUM_LOCK; break;
484493
case VK_SCROLL: nablaKeyCode = EKC_SCROLL_LOCK; break;
485494
case VK_VOLUME_MUTE: nablaKeyCode = EKC_VOLUME_MUTE; break;

0 commit comments

Comments
 (0)