mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cherry-pick imgui fix @4986dba27.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-03-24 18:12:36 +01:00
parent a7cedddcef
commit f45276a596
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imgui/imgui.cpp
View File

@ -7210,7 +7210,8 @@ static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool s
target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f; target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f;
scroll.y = target_y - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height); scroll.y = target_y - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height);
} }
scroll = ImMax(scroll, ImVec2(0.0f, 0.0f)); scroll.x = IM_FLOOR(ImMax(scroll.x, 0.0f));
scroll.y = IM_FLOOR(ImMax(scroll.y, 0.0f));
if (!window->Collapsed && !window->SkipItems) if (!window->Collapsed && !window->SkipItems)
{ {
scroll.x = ImMin(scroll.x, window->ScrollMax.x); scroll.x = ImMin(scroll.x, window->ScrollMax.x);