Skip to content

Commit df3f344

Browse files
committed
Add insert function to the ModifierKeys class.
1 parent 134b5f1 commit df3f344

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Sources/NodeUIEngine/NUIE_InputEventHandler.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ static const std::unordered_set<ModifierKeyCode> noKeys;
88
ModifierKeys EmptyModifierKeys (noKeys);
99
Key InvalidKey;
1010

11+
ModifierKeys::ModifierKeys () :
12+
keys ()
13+
{
14+
15+
}
16+
1117
ModifierKeys::ModifierKeys (const std::unordered_set<ModifierKeyCode>& keys) :
1218
keys (keys)
1319
{
@@ -19,6 +25,10 @@ ModifierKeys::~ModifierKeys ()
1925

2026
}
2127

28+
void ModifierKeys::Insert (ModifierKeyCode keyCode)
29+
{
30+
keys.insert (keyCode);
31+
}
2232

2333
bool ModifierKeys::Contains (ModifierKeyCode keyCode) const
2434
{

Sources/NodeUIEngine/NUIE_InputEventHandler.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,12 @@ namespace NUIE
7171
class ModifierKeys
7272
{
7373
public:
74+
ModifierKeys ();
7475
ModifierKeys (const std::unordered_set<ModifierKeyCode>& keys);
7576
~ModifierKeys ();
7677

77-
bool Contains (ModifierKeyCode keyCode) const;
78+
void Insert (ModifierKeyCode keyCode);
79+
bool Contains (ModifierKeyCode keyCode) const;
7880

7981
private:
8082
std::unordered_set<ModifierKeyCode> keys;

Sources/WindowsAppSupport/WAS_WindowsAppUtils.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ NE::BasicStringSettings GetStringSettingsFromSystem ()
4949

5050
NUIE::ModifierKeys GetModiferKeysFromEvent (WPARAM wParam)
5151
{
52-
std::unordered_set<NUIE::ModifierKeyCode> keys;
52+
NUIE::ModifierKeys keys;
5353
if (wParam & MK_CONTROL) {
54-
keys.insert (NUIE::ModifierKeyCode::Control);
54+
keys.Insert (NUIE::ModifierKeyCode::Control);
5555
}
5656
if (wParam & MK_SHIFT) {
57-
keys.insert (NUIE::ModifierKeyCode::Shift);
57+
keys.Insert (NUIE::ModifierKeyCode::Shift);
5858
}
59-
return NUIE::ModifierKeys (keys);
59+
return keys;
6060
}
6161

6262
static void AddCommandToMenu (const NUIE::MenuCommandPtr& command, std::unordered_map<size_t, NUIE::MenuCommandPtr>& commandTable, HMENU& hCurrentMenu, size_t& currentCommandId)

0 commit comments

Comments
 (0)