sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse Source
This commit is contained in:
Lynix
2020-05-27 19:48:22 +02:00
parent 8fa456bdf5 81f03f04e5
commit 68208f5426
179 changed files with 41359 additions and 5418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Engine/Platform/EventHandler/TextEnterState.cpp
View File

@@ -18,7 +18,7 @@ void TextEnterState::Enter(Ndk::StateMachine& fsm)
Nz::EventHandler& eventHandler = m_context.window.GetEventHandler();
m_keyPressedSlot.Connect(eventHandler.OnKeyPressed, [&] (const Nz::EventHandler*, const Nz::WindowEvent::KeyEvent& key)
{
if (key.code == Nz::Keyboard::Key::M && key.shift)
if (key.virtualKey == Nz::Keyboard::VKey::M && key.shift)
{
fsm.ChangeState(StateFactory::Get(EventStatus::Menu));
}
@@ -36,4 +36,4 @@ void TextEnterState::Enter(Ndk::StateMachine& fsm)
void TextEnterState::DrawMenu()
{
m_text.SetContent("Enter some text, this text should change !\nM for Menu");
}
}