github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-04 02:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

dep/imgui: Fix smooth scrolling with >60hz

Browse Source
This commit is contained in:
Stenzek 2025-05-27 17:20:46 +10:00
parent 6b811df6d0
commit 2da46f83bb
No known key found for this signature in database
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dep/imgui/src/imgui.cpp
View File

@ -11130,8 +11130,6 @@ static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window)
} }
// Based on https://github.com/ocornut/imgui/pull/7348 // Based on https://github.com/ocornut/imgui/pull/7348
// TODO: Make it not dependent on frame rate, easiest way would be to multiply by delta_time / (1/60).
// Smooth scroll.
// Instead use "Scroll" value in the window, all setters that sets the scroll absolutely now points to // Instead use "Scroll" value in the window, all setters that sets the scroll absolutely now points to
// "ScrollExpected" Here, we take from ScrollTarget (from some functions like ScrollHere + mouse wheel) to set // "ScrollExpected" Here, we take from ScrollTarget (from some functions like ScrollHere + mouse wheel) to set
// the ScrollExpected value Also, Scroll var in window is processed to meet ScrollExpected Value // the ScrollExpected value Also, Scroll var in window is processed to meet ScrollExpected Value
@ -11157,7 +11155,7 @@ static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window)
ImGuiStyle& style = g.Style; ImGuiStyle& style = g.Style;
if (scroll[axis] != window->ScrollExpected[axis]) if (scroll[axis] != window->ScrollExpected[axis])
{ {
const float multiplier = GImGui->IO.DeltaTime / (1.0f / 60.0f); const float multiplier = GImGui->IO.DeltaTime / (1.0f / ImMax(GImGui->IO.Framerate, 1.0f));
const float diff = window->ScrollExpected[axis] - scroll[axis]; const float diff = window->ScrollExpected[axis] - scroll[axis];
if (diff > 0) if (diff > 0)
scroll[axis] += ImMin(diff, (diff / (style.ScrollSmooth * multiplier))); scroll[axis] += ImMin(diff, (diff / (style.ScrollSmooth * multiplier)));