Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 20:07:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MouseWheel input is normalized

Browse Source
This commit is contained in:
omar 2014-11-21 13:24:57 +00:00
parent cf037b4769
commit 075fe0220e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imgui.cpp
View File

@ -1414,12 +1414,13 @@ void ImGui::NewFrame()
if (g.HoveredWindow && g.IO.MouseWheel != 0) if (g.HoveredWindow && g.IO.MouseWheel != 0)
{ {
ImGuiWindow* window = g.HoveredWindow; ImGuiWindow* window = g.HoveredWindow;
const int mouse_wheel_dir = g.IO.MouseWheel > 0 ? +1 : -1;
if (g.IO.KeyCtrl) if (g.IO.KeyCtrl)
{ {
if (g.IO.FontAllowUserScaling) if (g.IO.FontAllowUserScaling)
{ {
// Zoom / Scale window // 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; float scale = new_font_scale / window->FontWindowScale;
window->FontWindowScale = new_font_scale; window->FontWindowScale = new_font_scale;
@ -1434,7 +1435,7 @@ void ImGui::NewFrame()
{ {
// Scroll // Scroll
const int scroll_lines = (window->Flags & ImGuiWindowFlags_ComboBox) ? 3 : 5; 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;
} }
} }