Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. (#1718, #2036)
If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index cb924e6..678baee 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -34,7 +34,12 @@
Breaking Changes:
-- Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
+- Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and
+ stb_rect_pack.h to imstb_rectpack.h. If you were conveniently using the imgui copy of those
+ STB headers in your project, you will have to update your include paths. (#1718, #2036)
+ The reason for this change is to avoid conflicts for projects that may also be importing
+ their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
+- Renamed io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
Other Changes:
diff --git a/imgui.cpp b/imgui.cpp
index ce788aa..de16c68 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -342,6 +342,8 @@
When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files.
You can read releases logs https://github.com/ocornut/imgui/releases for more details.
+ - 2018/09/06 (1.65) - renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h.
+ If you were conveniently using the imgui copy of those STB headers in your project you will have to update your include paths.
- 2018/09/05 (1.65) - renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427)
- 2018/08/31 (1.64) - added imgui_widgets.cpp file, extracted and moved widgets code out of imgui.cpp into imgui_widgets.cpp. Re-ordered some of the code remaining in imgui.cpp.
NONE OF THE FUNCTIONS HAVE CHANGED. THE CODE IS SEMANTICALLY 100% IDENTICAL, BUT _EVERY_ FUNCTION HAS BEEN MOVED.
diff --git a/imgui_draw.cpp b/imgui_draw.cpp
index aab827c..e4f342f 100644
--- a/imgui_draw.cpp
+++ b/imgui_draw.cpp
@@ -119,7 +119,7 @@
#ifdef IMGUI_STB_RECT_PACK_FILENAME
#include IMGUI_STB_RECT_PACK_FILENAME
#else
-#include "stb_rect_pack.h"
+#include "imstb_rectpack.h"
#endif
#endif
@@ -142,7 +142,7 @@
#ifdef IMGUI_STB_TRUETYPE_FILENAME
#include IMGUI_STB_TRUETYPE_FILENAME
#else
-#include "stb_truetype.h"
+#include "imstb_truetype.h"
#endif
#endif
diff --git a/imgui_internal.h b/imgui_internal.h
index db233d3..1ba3b7a 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -76,7 +76,7 @@
#define STB_TEXTEDIT_STRING ImGuiInputTextState
#define STB_TEXTEDIT_CHARTYPE ImWchar
#define STB_TEXTEDIT_GETWIDTH_NEWLINE -1.0f
-#include "stb_textedit.h"
+#include "imstb_textedit.h"
} // namespace ImGuiStb
diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp
index 6230eab..a3cb3be 100644
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@@ -2960,7 +2960,7 @@
#define STB_TEXTEDIT_K_SHIFT 0x20000
#define STB_TEXTEDIT_IMPLEMENTATION
-#include "stb_textedit.h"
+#include "imstb_textedit.h"
}
diff --git a/stb_rect_pack.h b/imstb_rectpack.h
similarity index 100%
rename from stb_rect_pack.h
rename to imstb_rectpack.h
diff --git a/stb_textedit.h b/imstb_textedit.h
similarity index 100%
rename from stb_textedit.h
rename to imstb_textedit.h
diff --git a/stb_truetype.h b/imstb_truetype.h
similarity index 100%
rename from stb_truetype.h
rename to imstb_truetype.h
diff --git a/misc/freetype/imgui_freetype.cpp b/misc/freetype/imgui_freetype.cpp
index 8465945..89aa23f 100644
--- a/misc/freetype/imgui_freetype.cpp
+++ b/misc/freetype/imgui_freetype.cpp
@@ -244,7 +244,7 @@
#define STBRP_ASSERT(x) IM_ASSERT(x)
#define STBRP_STATIC
#define STB_RECT_PACK_IMPLEMENTATION
-#include "stb_rect_pack.h"
+#include "imstb_rectpack.h"
bool ImGuiFreeType::BuildFontAtlas(ImFontAtlas* atlas, unsigned int extra_flags)
{
