From 624c057ae1a836bcf7faa1c7502b3ad4c0f07d87 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 2 Feb 2023 18:09:20 +0100 Subject: [PATCH] Backends: GLFW: revert flipping mouse-wheel axis for Emscripten. (#4019) Latest version seems ok. --- backends/imgui_impl_glfw.cpp | 8 -------- docs/CHANGELOG.txt | 2 -- 2 files changed, 10 deletions(-) diff --git a/backends/imgui_impl_glfw.cpp b/backends/imgui_impl_glfw.cpp index 23470b31..d0dedf64 100644 --- a/backends/imgui_impl_glfw.cpp +++ b/backends/imgui_impl_glfw.cpp @@ -16,7 +16,6 @@ // CHANGELOG // (minor and older changes stripped away, please see git history for details) -// 2023-02-01: Inputs: flipping both wheel axises when running on Emscripten's GLFW emulation. (#6096) // 2023-01-04: Inputs: Fixed mods state on Linux when using Alt-GR text input (e.g. German keyboard layout), could lead to broken text input. Revert a 2022/01/17 change were we resumed using mods provided by GLFW, turns out they were faulty. // 2022-11-22: Perform a dummy glfwGetError() read to cancel missing names with glfwGetKeyName(). (#5908) // 2022-10-18: Perform a dummy glfwGetError() read to cancel missing mouse cursors errors. Using GLFW_VERSION_COMBINED directly. (#5785) @@ -284,13 +283,6 @@ void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yo if (bd->PrevUserCallbackScroll != nullptr && window == bd->Window) bd->PrevUserCallbackScroll(window, xoffset, yoffset); -#if defined(__EMSCRIPTEN__) - // Emscripten's GLFW emulation reports grossly mis-scaled and flipped scroll events. - // The scale is still currently incorrect, see #4019 #6096 for details. - xoffset = -xoffset; - yoffset = -yoffset; -#endif - ImGuiIO& io = ImGui::GetIO(); io.AddMouseWheelEvent((float)xoffset, (float)yoffset); } diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index b4c66cac..c18e95ce 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -45,8 +45,6 @@ Breaking changes: offer consistent horizontal scrolling direction. (#4019) - Backends: SDL: flipping SDL_MOUSEWHEEL 'wheel.x' value to match other backends and offer consistent horizontal scrolling direction. (#4019) - - Backends: GLFW+Emscripten: flipping both wheels axises when running on Emscripten's - GLFW emulation. (#6096) [@topolarity] - Shift+WheelY support on non-OSX machines was already correct. (#2424, #1463) (whereaas on OSX machines Shift+WheelY turns into WheelX at the OS level). - If you use a custom-backend, you should verify that: