1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-22 23:56:36 +00:00

Fix bad merge

This commit is contained in:
omar 2017-12-08 15:11:35 +01:00
parent a6f37287d8
commit 9ce51ad9f6

View File

@ -5633,7 +5633,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
{ {
// FIXME-NAVIGATION: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck. // FIXME-NAVIGATION: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck.
g.NavWindowingToggleLayer = false; g.NavWindowingToggleLayer = false;
size_target = CalcSizeFullWithConstraint(window, window->SizeFull + nav_resize_delta); size_target = CalcSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
} }
} }
} }