commit 075fe0220e6d48bf9438ae874715d1f2e2b6e419
author omar <omarcornut@gmail.com> Fri Nov 21 13:24:57 2014 +0000
committer omar <omarcornut@gmail.com> Fri Nov 21 13:24:57 2014 +0000
tree faf8769f286495a82d6f546d3ebda3f87251a8f7
parent cf037b4769650da319f8f6a039be1f394b30c7f2

MouseWheel input is normalized

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 07b02a0..bb1a785 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -1414,12 +1414,13 @@
     if (g.HoveredWindow && g.IO.MouseWheel != 0)
     {
         ImGuiWindow* window = g.HoveredWindow;
+        const int mouse_wheel_dir = g.IO.MouseWheel > 0 ? +1 : -1;
         if (g.IO.KeyCtrl)
         {
             if (g.IO.FontAllowUserScaling)
             {
                 // Zoom / Scale window
-                float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f);
+                float new_font_scale = ImClamp(window->FontWindowScale + mouse_wheel_dir * 0.10f, 0.50f, 2.50f);
                 float scale = new_font_scale / window->FontWindowScale;
                 window->FontWindowScale = new_font_scale;
 
@@ -1434,7 +1435,7 @@
         {
             // Scroll
             const int scroll_lines = (window->Flags & ImGuiWindowFlags_ComboBox) ? 3 : 5;
-            window->NextScrollY -= g.IO.MouseWheel * window->FontSize() * scroll_lines;
+            window->NextScrollY -= mouse_wheel_dir * window->FontSize() * scroll_lines;
         }
     }