From 5a679a45ccb422bf90d347b1e2087295fd9725cd Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 6 Sep 2018 15:58:25 +0200 Subject: [PATCH 1/2] 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. --- docs/CHANGELOG.txt | 7 ++++++- imgui.cpp | 2 ++ imgui_draw.cpp | 4 ++-- imgui_internal.h | 2 +- imgui_widgets.cpp | 2 +- stb_rect_pack.h => imstb_rectpack.h | 0 stb_textedit.h => imstb_textedit.h | 0 stb_truetype.h => imstb_truetype.h | 0 misc/freetype/imgui_freetype.cpp | 2 +- 9 files changed, 13 insertions(+), 6 deletions(-) rename stb_rect_pack.h => imstb_rectpack.h (100%) rename stb_textedit.h => imstb_textedit.h (100%) rename stb_truetype.h => imstb_truetype.h (100%) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index cb924e66..678baeeb 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -34,7 +34,12 @@ HOW TO UPDATE? 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 ce788aae..de16c68b 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -342,6 +342,8 @@ CODE 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 aab827cb..e4f342ff 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -119,7 +119,7 @@ namespace IMGUI_STB_NAMESPACE #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 @@ namespace IMGUI_STB_NAMESPACE #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 db233d31..1ba3b7aa 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -76,7 +76,7 @@ namespace ImGuiStb #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 6230eabc..a3cb3be1 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -2960,7 +2960,7 @@ static bool STB_TEXTEDIT_INSERTCHARS(STB_TEXTEDIT_STRING* obj, int pos, const Im #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 84659456..89aa23f5 100644 --- a/misc/freetype/imgui_freetype.cpp +++ b/misc/freetype/imgui_freetype.cpp @@ -244,7 +244,7 @@ namespace #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) { From e0cab5664adf02c030f9cf2a05d2c334638a85f8 Mon Sep 17 00:00:00 2001 From: omar Date: Thu, 6 Sep 2018 15:58:58 +0200 Subject: [PATCH 2/2] Version 1.65 --- docs/CHANGELOG.txt | 4 +++- imgui.cpp | 2 +- imgui.h | 6 +++--- imgui_demo.cpp | 2 +- imgui_draw.cpp | 2 +- imgui_internal.h | 2 +- imgui_widgets.cpp | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 678baeeb..17673022 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -28,8 +28,9 @@ HOW TO UPDATE? and API updates have been a little more frequent lately. They are documented below and in imgui.cpp and should not affect all users. - Please report any issue! + ----------------------------------------------------------------------- - VERSION 1.65 (In Progress) + VERSION 1.65 (Released 2018-09-06) ----------------------------------------------------------------------- Breaking Changes: @@ -43,6 +44,7 @@ Breaking Changes: Other Changes: +- This is a minor release following the 1.64 refactor, with a little more shuffling of code. - Clarified and improved the source code sectioning in all files (easier to search or browse sections). - Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787) diff --git a/imgui.cpp b/imgui.cpp index de16c68b..e6a9bc1a 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (main code and documentation) // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code. diff --git a/imgui.h b/imgui.h index 8980926c..26c8887c 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (headers) // See imgui.cpp file for documentation. @@ -23,8 +23,8 @@ // Version // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY00 then bounced up to XYY01 when release tagging happens) -#define IMGUI_VERSION "1.65 WIP" -#define IMGUI_VERSION_NUM 16500 +#define IMGUI_VERSION "1.65" +#define IMGUI_VERSION_NUM 16501 #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 9da9fb19..de891bec 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (demo code) // Message to the person tempted to delete this file when integrating ImGui into their code base: diff --git a/imgui_draw.cpp b/imgui_draw.cpp index e4f342ff..3afcac4e 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (drawing and font code) /* diff --git a/imgui_internal.h b/imgui_internal.h index 1ba3b7aa..050f2acf 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (internal structures/api) // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index a3cb3be1..110c4f86 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.65 WIP +// dear imgui, v1.65 // (widgets code) /*