From f341497973df7abf2c993d1e2f150cc85df4722f Mon Sep 17 00:00:00 2001 From: Jonathan <41275844+Jonathhhan@users.noreply.github.com> Date: Fri, 2 Dec 2022 05:56:22 +0100 Subject: [PATCH 1/4] Update ImHelpers.h --- src/ImHelpers.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ImHelpers.h b/src/ImHelpers.h index b06107aa..b148ab24 100644 --- a/src/ImHelpers.h +++ b/src/ImHelpers.h @@ -6,6 +6,7 @@ #include "ofTexture.h" #include "ofGLBaseTypes.h" #include "imgui.h" +#include "stack" static const int kImGuiMargin = 10; From 959156cf9b3276a91df16efa33c4ce5eac83853b Mon Sep 17 00:00:00 2001 From: Jonathan <41275844+Jonathhhan@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:56:15 +0100 Subject: [PATCH 2/4] Update BaseEngine.cpp --- src/BaseEngine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BaseEngine.cpp b/src/BaseEngine.cpp index a9d7d805..01b61942 100644 --- a/src/BaseEngine.cpp +++ b/src/BaseEngine.cpp @@ -25,10 +25,10 @@ namespace ofxImGui //-------------------------------------------------------------- void BaseEngine::onKeyPressed(ofKeyEventArgs& event) { - int key = event.keycode; + int key = event.key; ImGuiIO& io = ImGui::GetIO(); io.KeysDown[key] = true; - //io->AddInputCharacter((unsigned short)event.codepoint); + io.AddInputCharacter((unsigned short)event.key); } //-------------------------------------------------------------- From bb9efebd5fa25a61ce77f343987fa40e6d37d4d1 Mon Sep 17 00:00:00 2001 From: Jonathan <41275844+Jonathhhan@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:57:45 +0100 Subject: [PATCH 3/4] Update EngineOpenGLES.cpp --- src/EngineOpenGLES.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/EngineOpenGLES.cpp b/src/EngineOpenGLES.cpp index b3a36cf7..a40e84db 100644 --- a/src/EngineOpenGLES.cpp +++ b/src/EngineOpenGLES.cpp @@ -287,10 +287,10 @@ namespace ofxImGui //-------------------------------------------------------------- void EngineOpenGLES::onKeyReleased(ofKeyEventArgs& event) { - int key = event.keycode; + int key = event.key; ImGuiIO& io = ImGui::GetIO(); io.KeysDown[key] = false; - io.AddInputCharacter((unsigned short)event.codepoint); + io.AddInputCharacter((unsigned short)event.key); //TODO modifiers? } } From c5e741bce4f8a6c5cdf30671a274e720249faef6 Mon Sep 17 00:00:00 2001 From: Jonathan <41275844+Jonathhhan@users.noreply.github.com> Date: Fri, 2 Dec 2022 17:47:10 +0100 Subject: [PATCH 4/4] Update EngineOpenGLES.cpp --- src/EngineOpenGLES.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/EngineOpenGLES.cpp b/src/EngineOpenGLES.cpp index a40e84db..0cb3cc8a 100644 --- a/src/EngineOpenGLES.cpp +++ b/src/EngineOpenGLES.cpp @@ -290,8 +290,6 @@ namespace ofxImGui int key = event.key; ImGuiIO& io = ImGui::GetIO(); io.KeysDown[key] = false; - io.AddInputCharacter((unsigned short)event.key); - //TODO modifiers? } }