|
@@ -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);
|
|
}
|
|
}
|