kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-10 11:58:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert missing ImFontConfig_DefaultConstructor, fix fn name ImFont_GetFallbackAdvanceX

Browse Source
This commit is contained in:
yosikawa
2017-11-15 00:00:49 +09:00
committed by Stephan Dilly
parent 511218914b
commit fa1b93bea9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cimgui/cimgui.h
View File

@@ -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);

5
cimgui/fontAtlas.cpp
View File

@@ -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);