Skip to content

Commit e48c7ac

Browse files
kovacsvkovacsv
committed
Rename PressedKeyCode to KeyCode.
1 parent 6a28477 commit e48c7ac

6 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎Sources/NodeEngineTest/NodeEditorVisualTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,15 @@ TEST (UndoTest)
362362
ASSERT (env.CheckReference ("UndoTest_Initial.svg"));
363363

364364
for (int i = 1; i <= 11; i++) {
365-
env.nodeEditor.OnKeyPress (Key (PressedKeyCode::Undo));
365+
env.nodeEditor.OnKeyPress (Key (KeyCode::Undo));
366366
std::string indexString = std::to_string (i);
367367
while (indexString.length () < 2) {
368368
indexString = "0" + indexString;
369369
}
370370
ASSERT (env.CheckReference ("UndoTest_Undo_" + indexString + ".svg"));
371371
}
372372
for (int i = 1; i <= 11; i++) {
373-
env.nodeEditor.OnKeyPress (Key (PressedKeyCode::Redo));
373+
env.nodeEditor.OnKeyPress (Key (KeyCode::Redo));
374374
std::string indexString = std::to_string (i);
375375
while (indexString.length () < 2) {
376376
indexString = "0" + indexString;

‎Sources/NodeUIEngine/NUIE_InputEventHandler.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,31 @@ bool ModifierKeys::Contains (ModifierKeyCode keyCode) const
2525
}
2626

2727
Key::Key () :
28-
pressedKeyCode (PressedKeyCode::Undefined)
28+
keyCode (KeyCode::Undefined)
2929
{
3030

3131
}
3232

33-
Key::Key (PressedKeyCode pressedKeyCode) :
34-
pressedKeyCode (pressedKeyCode)
33+
Key::Key (KeyCode keyCode) :
34+
keyCode (keyCode)
3535
{
3636

3737
}
3838

3939
bool Key::IsValid () const
4040
{
41-
return pressedKeyCode != PressedKeyCode::Undefined;
41+
return keyCode != KeyCode::Undefined;
4242
}
4343

44-
PressedKeyCode Key::GetKeyCode () const
44+
KeyCode Key::GetKeyCode () const
4545
{
4646
DBGASSERT (IsValid ());
47-
return pressedKeyCode;
47+
return keyCode;
4848
}
4949

50-
void Key::SetKeyCode (PressedKeyCode newPressedKeyCode)
50+
void Key::SetKeyCode (KeyCode newKeyCode)
5151
{
52-
pressedKeyCode = newPressedKeyCode;
52+
keyCode = newKeyCode;
5353
}
5454

5555
InputEventHandler::InputEventHandler ()

‎Sources/NodeUIEngine/NUIE_InputEventHandler.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ enum class ModifierKeyCode
2929
Shift = 2
3030
};
3131

32-
enum class PressedKeyCode
32+
enum class KeyCode
3333
{
3434
Undefined,
3535
Escape,
@@ -85,15 +85,15 @@ class Key
8585
{
8686
public:
8787
Key ();
88-
Key (PressedKeyCode pressedKeyCode);
88+
Key (KeyCode keyCode);
8989

90-
bool IsValid () const;
90+
bool IsValid () const;
9191

92-
PressedKeyCode GetKeyCode () const;
93-
void SetKeyCode (PressedKeyCode newPressedKeyCode);
92+
KeyCode GetKeyCode () const;
93+
void SetKeyCode (KeyCode newKeyCode);
9494

9595
private:
96-
PressedKeyCode pressedKeyCode;
96+
KeyCode keyCode;
9797
};
9898

9999
extern Key InvalidKey;

‎Sources/NodeUIEngine/NUIE_InteractionHandler.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ EventHandlerResult InteractionHandler::HandleMouseWheel (NodeUIEnvironment&, con
599599

600600
EventHandlerResult InteractionHandler::HandleKeyPress (NodeUIEnvironment& env, const Key& pressedKey)
601601
{
602-
if (pressedKey.GetKeyCode () == PressedKeyCode::Escape) {
602+
if (pressedKey.GetKeyCode () == KeyCode::Escape) {
603603
if (multiMouseMoveHandler.HasHandler ()) {
604604
multiMouseMoveHandler.AbortHandlers ();
605605
return EventHandlerResult::EventHandled;
@@ -614,12 +614,12 @@ EventHandlerResult InteractionHandler::HandleKeyPress (NodeUIEnvironment& env, c
614614
MenuCommandPtr command = nullptr;
615615

616616
switch (pressedKey.GetKeyCode ()) {
617-
case PressedKeyCode::Delete:
617+
case KeyCode::Delete:
618618
{
619619
command.reset (new DeleteNodesMenuCommand (uiManager, env, selectedNodes));
620620
}
621621
break;
622-
case PressedKeyCode::SelectAll:
622+
case KeyCode::SelectAll:
623623
{
624624
NE::NodeCollection allSelectedNodes;
625625
uiManager.EnumerateUINodes ([&] (const UINodeConstPtr& uiNode) {
@@ -629,29 +629,29 @@ EventHandlerResult InteractionHandler::HandleKeyPress (NodeUIEnvironment& env, c
629629
uiManager.SetSelectedNodes (allSelectedNodes);
630630
}
631631
break;
632-
case PressedKeyCode::Copy:
632+
case KeyCode::Copy:
633633
{
634634
command.reset (new CopyNodesMenuCommand (uiManager, selectedNodes));
635635
}
636636
break;
637-
case PressedKeyCode::Paste:
637+
case KeyCode::Paste:
638638
{
639639
Point modelPastePosition = pastePositionCalculator.CalculatePastePosition (uiManager, env);
640640
command.reset (new PasteNodesMenuCommand (uiManager, modelPastePosition));
641641
}
642642
break;
643-
case PressedKeyCode::Undo:
643+
case KeyCode::Undo:
644644
{
645645
command.reset (new UndoMenuCommand (uiManager, env));
646646
}
647647
break;
648-
case PressedKeyCode::Redo:
648+
case KeyCode::Redo:
649649
{
650650
command.reset (new RedoMenuCommand (uiManager, env));
651651
}
652652
break;
653-
case PressedKeyCode::Escape:
654-
case PressedKeyCode::Undefined:
653+
case KeyCode::Escape:
654+
case KeyCode::Undefined:
655655
DBGBREAK ();
656656
break;
657657
}

‎Sources/WindowsAppSupport/WAS_NodeEditorHwndControl.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static LRESULT CALLBACK NodeEditorStaticWindowProc (HWND hwnd, UINT msg, WPARAM
113113
break;
114114
case WM_MOUSEMOVE:
115115
{
116-
SetFocus (hwnd); // before Windows 10 only the focused window catches the mouse wheel message
116+
SetFocus (hwnd);
117117
int x = GET_X_LPARAM (lParam);
118118
int y = GET_Y_LPARAM (lParam);
119119
nodeEditor->OnMouseMove (GetModiferKeysFromEvent (wParam), x, y);
@@ -160,33 +160,33 @@ static LRESULT CALLBACK NodeEditorStaticWindowProc (HWND hwnd, UINT msg, WPARAM
160160
break;
161161
case WM_KEYDOWN:
162162
{
163-
NUIE::Key pressedKey (NUIE::PressedKeyCode::Undefined);
163+
NUIE::Key pressedKey (NUIE::KeyCode::Undefined);
164164
bool isControlPressed = (GetKeyState (VK_CONTROL) < 0);
165165
if (isControlPressed) {
166166
switch (wParam) {
167167
case 'A':
168-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::SelectAll);
168+
pressedKey.SetKeyCode (NUIE::KeyCode::SelectAll);
169169
break;
170170
case 'C':
171-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Copy);
171+
pressedKey.SetKeyCode (NUIE::KeyCode::Copy);
172172
break;
173173
case 'V':
174-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Paste);
174+
pressedKey.SetKeyCode (NUIE::KeyCode::Paste);
175175
break;
176176
case 'Z':
177-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Undo);
177+
pressedKey.SetKeyCode (NUIE::KeyCode::Undo);
178178
break;
179179
case 'Y':
180-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Redo);
180+
pressedKey.SetKeyCode (NUIE::KeyCode::Redo);
181181
break;
182182
}
183183
} else {
184184
switch (wParam) {
185185
case VK_ESCAPE:
186-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Escape);
186+
pressedKey.SetKeyCode (NUIE::KeyCode::Escape);
187187
break;
188188
case VK_DELETE:
189-
pressedKey.SetKeyCode (NUIE::PressedKeyCode::Delete);
189+
pressedKey.SetKeyCode (NUIE::KeyCode::Delete);
190190
break;
191191
}
192192
}

‎Sources/wxWidgetsAppSupport/WXAS_ControlUtilities.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,25 @@ NUIE::Key GetKeyFromEvent (wxKeyEvent& evt)
6363
int key = evt.GetKeyCode ();
6464
switch (key) {
6565
case WXK_ESCAPE:
66-
return NUIE::Key (NUIE::PressedKeyCode::Escape);
66+
return NUIE::Key (NUIE::KeyCode::Escape);
6767
case WXK_DELETE:
68-
return NUIE::Key (NUIE::PressedKeyCode::Delete);
68+
return NUIE::Key (NUIE::KeyCode::Delete);
6969
}
7070
}
7171

7272
NUIE::ModifierKeys modifierKeys = GetModiferKeysFromEvent (evt);
7373
if (modifierKeys.Contains (NUIE::ModifierKeyCode::Control)) {
7474
switch (unicodeKey) {
7575
case L'A':
76-
return NUIE::Key (NUIE::PressedKeyCode::SelectAll);
76+
return NUIE::Key (NUIE::KeyCode::SelectAll);
7777
case L'C':
78-
return NUIE::Key (NUIE::PressedKeyCode::Copy);
78+
return NUIE::Key (NUIE::KeyCode::Copy);
7979
case L'V':
80-
return NUIE::Key (NUIE::PressedKeyCode::Paste);
80+
return NUIE::Key (NUIE::KeyCode::Paste);
8181
case L'Z':
82-
return NUIE::Key (NUIE::PressedKeyCode::Undo);
82+
return NUIE::Key (NUIE::KeyCode::Undo);
8383
case L'Y':
84-
return NUIE::Key (NUIE::PressedKeyCode::Redo);
84+
return NUIE::Key (NUIE::KeyCode::Redo);
8585
}
8686
}
8787

0 commit comments

Comments
 (0)