From 36ac96d641636e78cdb9481612387e176141a011 Mon Sep 17 00:00:00 2001 From: bloeys Date: Thu, 24 Feb 2022 07:50:35 +0400 Subject: [PATCH] Allow configuration when loading fonts --- ui/imgui/imgui.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ui/imgui/imgui.go b/ui/imgui/imgui.go index 37de44d..4fd3204 100755 --- a/ui/imgui/imgui.go +++ b/ui/imgui/imgui.go @@ -134,12 +134,22 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32) gl.Enable(gl.DEPTH_TEST) } -func (i *ImguiInfo) AddFontTTF(fontPath string, fontSize float32) imgui.Font { +func (i *ImguiInfo) AddFontTTF(fontPath string, fontSize float32, fontConfig *imgui.FontConfig, glyphRanges *imgui.GlyphRanges) imgui.Font { + + fontConfigToUse := imgui.DefaultFontConfig + if fontConfig != nil { + fontConfigToUse = *fontConfig + } + + glyphRangesToUse := imgui.EmptyGlyphRanges + if glyphRanges != nil { + glyphRangesToUse = *glyphRanges + } imIO := imgui.CurrentIO() a := imIO.Fonts() - f := a.AddFontFromFileTTF(fontPath, fontSize) + f := a.AddFontFromFileTTFV(fontPath, fontSize, fontConfigToUse, glyphRangesToUse) image := a.TextureDataAlpha8() gl.BindTexture(gl.TEXTURE_2D, i.texID)