@@ -18,15 +18,6 @@ FontData g_fonts;
1818
1919void LoadFonts ( float scale )
2020{
21- static const ImWchar rangesText[] = {
22- 0x0020 , 0xFFFF ,
23- 0 ,
24- };
25- static const ImWchar rangesIcons[] = {
26- ICON_MIN_FA, ICON_MAX_FA,
27- 0
28- };
29-
3021 ImGuiIO& io = ImGui::GetIO ();
3122
3223 ImFontConfig configBasic;
@@ -50,22 +41,22 @@ void LoadFonts( float scale )
5041
5142 io.Fonts ->Clear ();
5243
53- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 15 .0f * scale ), &configBasic, rangesText );
54- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 14 .0f * scale ), &configMerge, rangesIcons );
44+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 15 .0f * scale ), &configBasic );
45+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 14 .0f * scale ), &configMerge );
5546
56- g_fonts.mono = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontFixed->data (), fontFixed->size (), round ( 15 .0f * scale ), &configFixed, rangesText );
47+ g_fonts.mono = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontFixed->data (), fontFixed->size (), round ( 15 .0f * scale ), &configFixed );
5748
58- g_fonts.big = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 21 .0f * scale ), &configBasic, rangesText );
59- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge, rangesIcons );
49+ g_fonts.big = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 21 .0f * scale ), &configBasic );
50+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge );
6051
61- g_fonts.small = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 10 .0f * scale ), &configBasic, rangesText );
52+ g_fonts.small = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontNormal->data (), fontNormal->size (), round ( 10 .0f * scale ), &configBasic );
6253
63- g_fonts.bold = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontBold->data (), fontBold->size (), round ( 15 .0f * scale ), &configBasic, rangesText );
64- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge, rangesIcons );
54+ g_fonts.bold = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontBold->data (), fontBold->size (), round ( 15 .0f * scale ), &configBasic );
55+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge );
6556
66- g_fonts.boldItalic = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontBoldItalic->data (), fontBoldItalic->size (), round ( 15 .0f * scale ), &configBasic, rangesText );
67- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge, rangesIcons );
57+ g_fonts.boldItalic = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontBoldItalic->data (), fontBoldItalic->size (), round ( 15 .0f * scale ), &configBasic );
58+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge );
6859
69- g_fonts.italic = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontItalic->data (), fontItalic->size (), round ( 15 .0f * scale ), &configBasic, rangesText );
70- io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge, rangesIcons );
60+ g_fonts.italic = io.Fonts ->AddFontFromMemoryTTF ( (void *)fontItalic->data (), fontItalic->size (), round ( 15 .0f * scale ), &configBasic );
61+ io.Fonts ->AddFontFromMemoryTTF ( (void *)fontIcons->data (), fontIcons->size (), round ( 20 .0f * scale ), &configMerge );
7162}
0 commit comments