From 0730ec7577d84bb4e54ccb5657a7115f49e1e1af Mon Sep 17 00:00:00 2001 From: ocornut Date: Sun, 30 Nov 2014 17:41:08 +0000 Subject: [PATCH] Example apps: accumulate mouse wheel to accodomate for slow framerate. --- examples/directx11_example/main.cpp | 2 +- examples/directx9_example/main.cpp | 2 +- examples/opengl_example/main.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp index ea9a3411f..84d867395 100644 --- a/examples/directx11_example/main.cpp +++ b/examples/directx11_example/main.cpp @@ -317,7 +317,7 @@ LRESULT WINAPI MsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) io.MouseDown[1] = false; return true; case WM_MOUSEWHEEL: - io.MouseWheel = GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; + io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; return true; case WM_MOUSEMOVE: // Mouse position, in pixels (set to -1,-1 if no mouse / on another screen, etc.) diff --git a/examples/directx9_example/main.cpp b/examples/directx9_example/main.cpp index adb2bf307..047874c4a 100644 --- a/examples/directx9_example/main.cpp +++ b/examples/directx9_example/main.cpp @@ -153,7 +153,7 @@ LRESULT WINAPI MsgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) io.MouseDown[1] = false; return true; case WM_MOUSEWHEEL: - io.MouseWheel = GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; + io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; return true; case WM_MOUSEMOVE: // Mouse position, in pixels (set to -1,-1 if no mouse / on another screen, etc.) diff --git a/examples/opengl_example/main.cpp b/examples/opengl_example/main.cpp index 22e2b1b0e..61a9f3694 100644 --- a/examples/opengl_example/main.cpp +++ b/examples/opengl_example/main.cpp @@ -114,7 +114,7 @@ static void glfw_mouse_button_callback(GLFWwindow* window, int button, int actio static void glfw_scroll_callback(GLFWwindow* window, double xoffset, double yoffset) { ImGuiIO& io = ImGui::GetIO(); - io.MouseWheel = (float)yoffset; // Use fractional mouse wheel, 1.0 unit 5 lines. + io.MouseWheel += (float)yoffset; // Use fractional mouse wheel, 1.0 unit 5 lines. } static void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) @@ -258,7 +258,6 @@ int main(int argc, char** argv) { ImGuiIO& io = ImGui::GetIO(); mousePressed[0] = mousePressed[1] = false; - io.MouseWheel = 0; glfwPollEvents(); UpdateImGui();