From bdce8336364595d1a446957a6164c97363349a53 Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 25 Nov 2019 18:38:53 +0100 Subject: [PATCH] Version 1.74 --- docs/CHANGELOG.txt | 2 +- docs/FONTS.txt | 11 ++++------- examples/README.txt | 2 +- imgui.cpp | 2 +- imgui.h | 6 +++--- imgui_demo.cpp | 2 +- imgui_draw.cpp | 2 +- imgui_internal.h | 4 ++-- imgui_widgets.cpp | 2 +- misc/fonts/binary_to_compressed_c.cpp | 3 ++- 10 files changed, 17 insertions(+), 19 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index cb9e540a4..7232b97e5 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -30,7 +30,7 @@ HOW TO UPDATE? ----------------------------------------------------------------------- - VERSION 1.74 WIP (In Progress) + VERSION 1.74 (Released 2019-11-25) ----------------------------------------------------------------------- Breaking Changes: diff --git a/docs/FONTS.txt b/docs/FONTS.txt index 149479706..e3690f14a 100644 --- a/docs/FONTS.txt +++ b/docs/FONTS.txt @@ -1,10 +1,7 @@ ----------------------------------------------------------------------- - dear imgui, v1.74 WIP ----------------------------------------------------------------------- - docs/FONTS.txt - This is the Readme dedicated to fonts. - Also read https://www.dearimgui.org/faq for more ideas. ----------------------------------------------------------------------- +dear imgui +FONTS DOCUMENTATION + +Also read https://www.dearimgui.org/faq for more fonts related infos. The code in imgui.cpp embeds a copy of 'ProggyClean.ttf' (by Tristan Grimmer), a 13 pixels high, pixel-perfect font used by default. diff --git a/examples/README.txt b/examples/README.txt index 2c73c89d0..cf605ad14 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -1,5 +1,5 @@ ----------------------------------------------------------------------- - dear imgui, v1.74 WIP + dear imgui, v1.74 ----------------------------------------------------------------------- examples/README.txt (This is the README file for the examples/ folder. See docs/ for more documentation) diff --git a/imgui.cpp b/imgui.cpp index bfb60bd2a..c2b489ad3 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (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 e73ac3e2a..9fcdaeaae 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (headers) // See imgui.cpp file for documentation. @@ -47,8 +47,8 @@ Index of this file: // 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.74 WIP" -#define IMGUI_VERSION_NUM 17301 +#define IMGUI_VERSION "1.74" +#define IMGUI_VERSION_NUM 17400 #define IMGUI_CHECKVERSION() ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx)) // Define attributes of all API symbols declarations (e.g. for DLL under Windows) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 2bcab47bd..7e4759925 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (demo code) // Message to the person tempted to delete this file when integrating Dear ImGui into their code base: diff --git a/imgui_draw.cpp b/imgui_draw.cpp index 1efb2cb4e..8089bbef2 100644 --- a/imgui_draw.cpp +++ b/imgui_draw.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (drawing and font code) /* diff --git a/imgui_internal.h b/imgui_internal.h index 33730c1ed..738800982 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (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! @@ -156,7 +156,7 @@ extern IMGUI_API ImGuiContext* GImGui; // Current implicit context pointer #endif // "Paranoid" Debug Asserts are meant to only be enabled during specific debugging/work, otherwise would slow down the code too much. -#define IMGUI_DEBUG_PARANOID 1 +#define IMGUI_DEBUG_PARANOID 0 #if IMGUI_DEBUG_PARANOID #define IM_ASSERT_PARANOID(_EXPR) IM_ASSERT(_EXPR) #else diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 0c5a1967a..ec6f51a90 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -1,4 +1,4 @@ -// dear imgui, v1.74 WIP +// dear imgui, v1.74 // (widgets code) /* diff --git a/misc/fonts/binary_to_compressed_c.cpp b/misc/fonts/binary_to_compressed_c.cpp index 275695376..4c6f12007 100644 --- a/misc/fonts/binary_to_compressed_c.cpp +++ b/misc/fonts/binary_to_compressed_c.cpp @@ -1,4 +1,5 @@ -// ImGui - binary_to_compressed_c.cpp +// dear imgui +// (binary_to_compressed_c.cpp) // Helper tool to turn a file into a C array, if you want to embed font data in your source code. // The data is first compressed with stb_compress() to reduce source code size,