Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-02-25 22:38:10 +01:00
Code Releases Wiki Activity

Internals: Rework CalcItemWidth / CalcItemSize but make their similarities and their differences more obvious. (#2449)

Browse Source
This commit is contained in:
omar 2019-04-18 14:48:36 +02:00
parent f355a40367
commit a1cf7d636d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
imgui.cpp
View File

@ -5779,8 +5779,8 @@ float ImGui::CalcItemWidth()
float w = window->DC.ItemWidth; float w = window->DC.ItemWidth;
if (w < 0.0f) if (w < 0.0f)
{ {
float width_to_right_edge = GetContentRegionAvail().x; float region_max_x = GetContentRegionMaxScreen().x;
w = ImMax(1.0f, width_to_right_edge + w); w = ImMax(1.0f, region_max_x - window->DC.CursorPos.x + w);
} }
w = (float)(int)w; w = (float)(int)w;
return w; return w;
@ -5792,13 +5792,21 @@ float ImGui::CalcItemWidth()
ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h) ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_w, float default_h)
{ {
ImGuiWindow* window = GImGui->CurrentWindow; ImGuiWindow* window = GImGui->CurrentWindow;
ImVec2 content_max;
ImVec2 region_max;
if (size.x < 0.0f || size.y < 0.0f) if (size.x < 0.0f || size.y < 0.0f)
content_max = GetContentRegionMaxScreen(); region_max = GetContentRegionMaxScreen();
if (size.x <= 0.0f)
size.x = (size.x == 0.0f) ? default_w : ImMax(content_max.x - window->DC.CursorPos.x, 4.0f) + size.x; if (size.x == 0.0f)
if (size.y <= 0.0f) size.x = default_w;
size.y = (size.y == 0.0f) ? default_h : ImMax(content_max.y - window->DC.CursorPos.y, 4.0f) + size.y; else if (size.x < 0.0f)
size.x = ImMax(4.0f, region_max.x - window->DC.CursorPos.x) + size.x;
if (size.y == 0.0f)
size.y = default_h;
else if (size.y < 0.0f)
size.y = ImMax(4.0f, region_max.y - window->DC.CursorPos.y) + size.y;
return size; return size;
} }