Tabs: Fixed ShrinkWidths() redistribution of remainder leading to infinite bug (second fix). (#5652, #5262)
Amend b137f31
diff --git a/imgui.cpp b/imgui.cpp
index 995b35e..cad2b62 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -13236,7 +13236,7 @@
PushID(tab);
if (SmallButton("<")) { TabBarQueueReorder(tab_bar, tab, -1); } SameLine(0, 2);
if (SmallButton(">")) { TabBarQueueReorder(tab_bar, tab, +1); } SameLine();
- Text("%02d%c Tab 0x%08X '%s' Offset: %.1f, Width: %.1f/%.1f",
+ Text("%02d%c Tab 0x%08X '%s' Offset: %.2f, Width: %.2f/%.2f",
tab_n, (tab->ID == tab_bar->SelectedTabId) ? '*' : ' ', tab->ID, (tab->NameOffset != -1) ? tab_bar->GetTabName(tab) : "???", tab->Offset, tab->Width, tab->ContentWidth);
PopID();
}
diff --git a/imgui.h b/imgui.h
index ed87733..df712f0 100644
--- a/imgui.h
+++ b/imgui.h
@@ -65,7 +65,7 @@
// Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
#define IMGUI_VERSION "1.89 WIP"
-#define IMGUI_VERSION_NUM 18817
+#define IMGUI_VERSION_NUM 18818
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
#define IMGUI_HAS_TABLE
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index c4bcc56..822f2b0 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -1575,13 +1575,13 @@
width_excess += items[n].Width - width_rounded;
items[n].Width = width_rounded;
}
- while (width_excess >= 1.0f)
- for (int n = 0; n < count && width_excess >= 1.0f; n++)
- if (items[n].Width + 1.0f <= items[n].InitialWidth)
- {
- items[n].Width += 1.0f;
- width_excess -= 1.0f;
- }
+ while (width_excess > 0.0f)
+ for (int n = 0; n < count && width_excess > 0.0f; n++)
+ {
+ float width_to_add = ImMin(items[n].InitialWidth - items[n].Width, 1.0f);
+ items[n].Width += width_to_add;
+ width_excess -= width_to_add;
+ }
}
//-------------------------------------------------------------------------
