ImVector: added clear_delete(), clear_destruct() helpers.
diff --git a/imgui.cpp b/imgui.cpp
index c4568d1..7aa91ce 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -2927,8 +2927,7 @@
{
IM_ASSERT(DrawList == &DrawListInst);
IM_DELETE(Name);
- for (int i = 0; i != ColumnsStorage.Size; i++)
- ColumnsStorage[i].~ImGuiOldColumns();
+ ColumnsStorage.clear_destruct();
}
ImGuiID ImGuiWindow::GetID(const char* str, const char* str_end)
@@ -4189,9 +4188,7 @@
CallContextHooks(&g, ImGuiContextHookType_Shutdown);
// Clear everything else
- for (int i = 0; i < g.Windows.Size; i++)
- IM_DELETE(g.Windows[i]);
- g.Windows.clear();
+ g.Windows.clear_delete();
g.WindowsFocusOrder.clear();
g.WindowsTempSortBuffer.clear();
g.CurrentWindow = NULL;
@@ -4207,18 +4204,14 @@
g.OpenPopupStack.clear();
g.BeginPopupStack.clear();
- for (int i = 0; i < g.Viewports.Size; i++)
- IM_DELETE(g.Viewports[i]);
- g.Viewports.clear();
+ g.Viewports.clear_delete();
g.TabBars.Clear();
g.CurrentTabBarStack.clear();
g.ShrinkWidthBuffer.clear();
g.Tables.Clear();
- for (int i = 0; i < g.TablesTempDataStack.Size; i++)
- g.TablesTempDataStack[i].~ImGuiTableTempData();
- g.TablesTempDataStack.clear();
+ g.TablesTempDataStack.clear_destruct();
g.DrawChannelsTempMergeBuffer.clear();
g.ClipboardHandlerData.clear();
diff --git a/imgui.h b/imgui.h
index 7e2e75b..7465559 100644
--- a/imgui.h
+++ b/imgui.h
@@ -61,7 +61,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.84 WIP"
-#define IMGUI_VERSION_NUM 18306
+#define IMGUI_VERSION_NUM 18307
#define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
#define IMGUI_HAS_TABLE
@@ -1667,7 +1667,11 @@
inline ImVector() { Size = Capacity = 0; Data = NULL; }
inline ImVector(const ImVector<T>& src) { Size = Capacity = 0; Data = NULL; operator=(src); }
inline ImVector<T>& operator=(const ImVector<T>& src) { clear(); resize(src.Size); memcpy(Data, src.Data, (size_t)Size * sizeof(T)); return *this; }
- inline ~ImVector() { if (Data) IM_FREE(Data); }
+ inline ~ImVector() { if (Data) IM_FREE(Data); } // Important: does not destruct anything
+
+ inline void clear() { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } } // Important: does not destruct anything
+ inline void clear_delete() { for (int n = 0; n < Size; n++) IM_DELETE(Data[n]); clear(); } // Important: never called automatically! always explicit.
+ inline void clear_destruct() { for (int n = 0; n < Size; n++) Data[n].~T(); clear(); } // Important: never called automatically! always explicit.
inline bool empty() const { return Size == 0; }
inline int size() const { return Size; }
@@ -1677,7 +1681,6 @@
inline T& operator[](int i) { IM_ASSERT(i >= 0 && i < Size); return Data[i]; }
inline const T& operator[](int i) const { IM_ASSERT(i >= 0 && i < Size); return Data[i]; }
- inline void clear() { if (Data) { Size = Capacity = 0; IM_FREE(Data); Data = NULL; } }
inline T* begin() { return Data; }
inline const T* begin() const { return Data; }
inline T* end() { return Data + Size; }
diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index 190c4c7..ca435bb 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -2006,9 +2006,7 @@
void ImFontAtlas::ClearFonts()
{
IM_ASSERT(!Locked && "Cannot modify a locked ImFontAtlas between NewFrame() and EndFrame/Render()!");
- for (int i = 0; i < Fonts.Size; i++)
- IM_DELETE(Fonts[i]);
- Fonts.clear();
+ Fonts.clear_delete();
}
void ImFontAtlas::Clear()
@@ -2568,9 +2566,8 @@
}
}
- // Cleanup temporary (ImVector doesn't honor destructor)
- for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
- src_tmp_array[src_i].~ImFontBuildSrcData();
+ // Cleanup
+ src_tmp_array.clear_destruct();
ImFontAtlasBuildFinish(atlas);
return true;
diff --git a/misc/freetype/imgui_freetype.cpp b/misc/freetype/imgui_freetype.cpp
index db6ec94..e6221f4 100644
--- a/misc/freetype/imgui_freetype.cpp
+++ b/misc/freetype/imgui_freetype.cpp
@@ -688,8 +688,7 @@
// Cleanup
for (int buf_i = 0; buf_i < buf_bitmap_buffers.Size; buf_i++)
IM_FREE(buf_bitmap_buffers[buf_i]);
- for (int src_i = 0; src_i < src_tmp_array.Size; src_i++)
- src_tmp_array[src_i].~ImFontBuildSrcDataFT();
+ src_tmp_array.clear_destruct();
ImFontAtlasBuildFinish(atlas);
