mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-20 06:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Breaking) Fonts: rework GetCustomRect() api. Reintroduce ImFontAtlasRect.

Browse Source
This commit is contained in:
ocornut
2025-03-31 17:36:24 +02:00
parent f40274702d
commit db30e1b5b6
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
imgui_draw.cpp
View File

@@ -2501,7 +2501,6 @@ void ImTextureData::DestroyPixels()
// - ImFontAtlas::AddCustomRect()
// - ImFontAtlas::AddCustomRectFontGlyph()
// - ImFontAtlas::GetCustomRect()
// - ImFontAtlas::GetCustomRectUV()
// - ImFontAtlasGetMouseCursorTexData()
//-----------------------------------------------------------------------------
// - ImFontAtlasBuildMain()
@@ -3290,18 +3289,19 @@ int ImFontAtlas::AddCustomRectFontGlyphForSize(ImFont* font, float font_size, Im
}
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
const ImTextureRect* ImFontAtlas::GetCustomRect(int id)
{
return ImFontAtlasPackGetRect(this, (ImFontAtlasRectId)id);
}
void ImFontAtlas::GetCustomRectUV(const ImTextureRect* rect, ImVec2* out_uv_min, ImVec2* out_uv_max) const
bool ImFontAtlas::GetCustomRect(int id, ImFontAtlasRect* out_r) const
{
ImTextureRect* r = ImFontAtlasPackGetRect((ImFontAtlas*)this, (ImFontAtlasRectId)id);
if (r == NULL)
return false;
IM_ASSERT(TexData->Width > 0 && TexData->Height > 0); // Font atlas needs to be built before we can calculate UV coordinates
ImVec2 pos = ImVec2((float)rect->x, (float)rect->y);
ImVec2 size = ImVec2((float)rect->w, (float)rect->h);
*out_uv_min = (pos) * TexUvScale;
*out_uv_max = (pos + size) * TexUvScale;
out_r->x = r->x;
out_r->y = r->y;
out_r->w = r->w;
out_r->h = r->h;
out_r->uv0 = ImVec2((float)(r->x), (float)(r->y)) * TexUvScale;
out_r->uv1 = ImVec2((float)(r->x + r->w), (float)(r->y + r->h)) * TexUvScale;
return true;
}
bool ImFontAtlasGetMouseCursorTexData(ImFontAtlas* atlas, ImGuiMouseCursor cursor_type, ImVec2* out_offset, ImVec2* out_size, ImVec2 out_uv_border[2], ImVec2 out_uv_fill[2])