From 3b314c119b08939ef5d09dc0d4800283e67a50ff Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 8 Dec 2021 20:27:54 +0000 Subject: [PATCH] Fix space key being ignored --- plugins/Cardinal/src/ImGuiWidget.cpp | 4 ++-- src/CardinalUI.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Cardinal/src/ImGuiWidget.cpp b/plugins/Cardinal/src/ImGuiWidget.cpp index b58bd76..78302a7 100644 --- a/plugins/Cardinal/src/ImGuiWidget.cpp +++ b/plugins/Cardinal/src/ImGuiWidget.cpp @@ -215,7 +215,7 @@ void ImGuiWidget::onButton(const ButtonEvent& e) return; } - io.KeyCtrl = e.mods & GLFW_MOD_CTRL; + io.KeyCtrl = e.mods & GLFW_MOD_CONTROL; io.KeyShift = e.mods & GLFW_MOD_SHIFT; io.KeyAlt = e.mods & GLFW_MOD_ALT; io.KeySuper = e.mods & GLFW_MOD_SUPER; @@ -245,7 +245,7 @@ void ImGuiWidget::onSelectKey(const SelectKeyEvent& e) return; } - io.KeyCtrl = e.mods & GLFW_MOD_CTRL; + io.KeyCtrl = e.mods & GLFW_MOD_CONTROL; io.KeyShift = e.mods & GLFW_MOD_SHIFT; io.KeyAlt = e.mods & GLFW_MOD_ALT; io.KeySuper = e.mods & GLFW_MOD_SUPER; diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index 440fd60..02be1ec 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -514,7 +514,7 @@ protected: bool onCharacterInput(const CharacterInputEvent& ev) override { - if (ev.character <= ' ' || ev.character >= kKeyDelete) + if (ev.character < ' ' || ev.character >= kKeyDelete) return false; const int mods = glfwMods(ev.mod);