Преглед изворни кода

Backends: GLFW: revert flipping mouse-wheel axis for Emscripten. (#4019)

Latest version seems ok.
ocornut пре 2 година
родитељ
комит
624c057ae1
2 измењених фајлова са 0 додато и 10 уклоњено
  1. 0 8
      backends/imgui_impl_glfw.cpp
  2. 0 2
      docs/CHANGELOG.txt

+ 0 - 8
backends/imgui_impl_glfw.cpp

@@ -16,7 +16,6 @@
 
 
 // CHANGELOG
 // CHANGELOG
 // (minor and older changes stripped away, please see git history for details)
 // (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.
 //  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-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)
 //  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)
     if (bd->PrevUserCallbackScroll != nullptr && window == bd->Window)
         bd->PrevUserCallbackScroll(window, xoffset, yoffset);
         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();
     ImGuiIO& io = ImGui::GetIO();
     io.AddMouseWheelEvent((float)xoffset, (float)yoffset);
     io.AddMouseWheelEvent((float)xoffset, (float)yoffset);
 }
 }

+ 0 - 2
docs/CHANGELOG.txt

@@ -45,8 +45,6 @@ Breaking changes:
     offer consistent horizontal scrolling direction. (#4019)
     offer consistent horizontal scrolling direction. (#4019)
   - Backends: SDL: flipping SDL_MOUSEWHEEL 'wheel.x' value to match other backends and
   - Backends: SDL: flipping SDL_MOUSEWHEEL 'wheel.x' value to match other backends and
     offer consistent horizontal scrolling direction. (#4019)
     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)
   - 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).
     (whereaas on OSX machines Shift+WheelY turns into WheelX at the OS level).
   - If you use a custom-backend, you should verify that:
   - If you use a custom-backend, you should verify that: