diff --git a/lib/external/imgui/source/imgui_impl_glfw.cpp b/lib/external/imgui/source/imgui_impl_glfw.cpp index 0ba6dfc05..83c98bee0 100644 --- a/lib/external/imgui/source/imgui_impl_glfw.cpp +++ b/lib/external/imgui/source/imgui_impl_glfw.cpp @@ -414,6 +414,10 @@ void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window, int keycode, int scancode, i if (bd->PrevUserCallbackKey != NULL && window == bd->Window) bd->PrevUserCallbackKey(window, keycode, scancode, action, mods); + // IMHEX PATCH BEGIN + if (keycode == GLFW_KEY_UNKNOWN) + return; + // IMHEX PATCH END if (action != GLFW_PRESS && action != GLFW_RELEASE) return; diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 49f3fb30d..2b0c7a4a4 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 49f3fb30dcb3044a2bb535958b7b954c81ec23ef +Subproject commit 2b0c7a4a4c2325a5cd6dc6104b5a85bbde85ff37 diff --git a/lib/libimhex/include/hex/ui/imgui_imhex_extensions.h b/lib/libimhex/include/hex/ui/imgui_imhex_extensions.h index c4b2d22c1..62cc18449 100644 --- a/lib/libimhex/include/hex/ui/imgui_imhex_extensions.h +++ b/lib/libimhex/include/hex/ui/imgui_imhex_extensions.h @@ -30,6 +30,8 @@ enum ImGuiCustomCol { ImGuiCustomCol_IEEEToolExp, ImGuiCustomCol_IEEEToolMantissa, + ImGuiCustomCol_BlurBackground, + ImGuiCustomCol_COUNT }; diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp index 3ee11e067..5cfd4226b 100644 --- a/main/source/window/window.cpp +++ b/main/source/window/window.cpp @@ -864,6 +864,8 @@ namespace hex { glfwSetKeyCallback(this->m_window, [](GLFWwindow *window, int key, int scancode, int action, int mods) { hex::unused(mods); + if (key == GLFW_KEY_UNKNOWN) return; + auto keyName = glfwGetKeyName(key, scancode); if (keyName != nullptr) key = std::toupper(keyName[0]);