From fa1b93bea99cc7f5edd1c9a6400ce008218e9b64 Mon Sep 17 00:00:00 2001 From: yosikawa Date: Wed, 15 Nov 2017 00:00:49 +0900 Subject: [PATCH] revert missing ImFontConfig_DefaultConstructor, fix fn name ImFont_GetFallbackAdvanceX --- cimgui/cimgui.h | 4 +++- cimgui/fontAtlas.cpp | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cimgui/cimgui.h b/cimgui/cimgui.h index 7d14cc9..72d6650 100644 --- a/cimgui/cimgui.h +++ b/cimgui/cimgui.h @@ -807,6 +807,8 @@ CIMGUI_API void igDestroyContext(struct ImGuiContext* ctx); CIMGUI_API struct ImGuiContext* igGetCurrentContext(); CIMGUI_API void igSetCurrentContext(struct ImGuiContext* ctx); +CIMGUI_API void ImFontConfig_DefaultConstructor(struct ImFontConfig* config); + // ImGuiIO CIMGUI_API void ImGuiIO_AddInputCharacter(unsigned short c); CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(CONST char* utf8_chars); @@ -978,7 +980,7 @@ CIMGUI_API void ImFont_SetScale(struct ImFont* font, float Scale_); CIMGUI_API void ImFont_GetDisplayOffset(const struct ImFont* font, struct ImVec2* pOut); CIMGUI_API const struct IMFONTGLYPH* ImFont_GetFallbackGlyph(const struct ImFont* font); CIMGUI_API void ImFont_SetFallbackGlyph(struct ImFont* font, const struct IMFONTGLYPH* FallbackGlyph_); -CIMGUI_API float ImFont_GetFallbackXAdvance(const struct ImFont* font); +CIMGUI_API float ImFont_GetFallbackAdvanceX(const struct ImFont* font); CIMGUI_API ImWchar ImFont_GetFallbackChar(const struct ImFont* font); CIMGUI_API short ImFont_GetConfigDataCount(const struct ImFont* font); CIMGUI_API struct ImFontConfig* ImFont_GetConfigData(struct ImFont* font); diff --git a/cimgui/fontAtlas.cpp b/cimgui/fontAtlas.cpp index c46bfa8..3aca304 100644 --- a/cimgui/fontAtlas.cpp +++ b/cimgui/fontAtlas.cpp @@ -2,6 +2,11 @@ #include "../imgui/imgui.h" #include "cimgui.h" +CIMGUI_API void ImFontConfig_DefaultConstructor(ImFontConfig* config) +{ + *config = ImFontConfig(); +} + CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* atlas, unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel) { atlas->GetTexDataAsRGBA32(out_pixels, out_width, out_height, out_bytes_per_pixel);