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

SplitterBehavior: tweak to not assert due to floating point precision.

Browse Source 
Not guaranting behavior: clamping makes output lossy, size_1+size_2 in theory may be instable but couldn't repro.
API probably needs rework anyhow (should redistribute from provided available space).
This commit is contained in:
ocornut 2023-11-14 15:34:30 +01:00
parent afadf74a53
commit 5de1312e1c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
imgui_widgets.cpp
View File

@ -1564,8 +1564,7 @@ bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float
ImRect bb_render = bb; ImRect bb_render = bb;
if (held) if (held)
{ {
ImVec2 mouse_delta_2d = g.IO.MousePos - g.ActiveIdClickOffset - bb_interact.Min; float mouse_delta = (g.IO.MousePos - g.ActiveIdClickOffset - bb_interact.Min)[axis];
float mouse_delta = (axis == ImGuiAxis_Y) ? mouse_delta_2d.y : mouse_delta_2d.x;
// Minimum pane size // Minimum pane size
float size_1_maximum_delta = ImMax(0.0f, *size1 - min_size1); float size_1_maximum_delta = ImMax(0.0f, *size1 - min_size1);
@ -1578,12 +1577,8 @@ bool ImGui::SplitterBehavior(const ImRect& bb, ImGuiID id, ImGuiAxis axis, float
// Apply resize // Apply resize
if (mouse_delta != 0.0f) if (mouse_delta != 0.0f)
{ {
if (mouse_delta < 0.0f) *size1 = ImMax(*size1 + mouse_delta, min_size1);
IM_ASSERT(*size1 + mouse_delta >= min_size1); *size2 = ImMax(*size2 - mouse_delta, min_size2);
if (mouse_delta > 0.0f)
IM_ASSERT(*size2 - mouse_delta >= min_size2);
*size1 += mouse_delta;
*size2 -= mouse_delta;
bb_render.Translate((axis == ImGuiAxis_X) ? ImVec2(mouse_delta, 0.0f) : ImVec2(0.0f, mouse_delta)); bb_render.Translate((axis == ImGuiAxis_X) ? ImVec2(mouse_delta, 0.0f) : ImVec2(0.0f, mouse_delta));
MarkItemEdited(id); MarkItemEdited(id);
} }