mirror of
https://github.com/wolfpld/tracy.git
synced 2024-11-10 02:31:48 +00:00
Replace Arimo with Droid Sans.
This commit is contained in:
parent
d0d0aca758
commit
cccce5534c
@ -3639,7 +3639,7 @@ The following libraries are included with and used by the Tracy Profiler. Entrie
|
||||
|
||||
\item Apache license 2.0
|
||||
\begin{itemize}
|
||||
\item Arimo font -- \url{https://fonts.google.com/specimen/Arimo}
|
||||
\item Droid Sans -- \url{https://www.fontsquirrel.com/fonts/droid-sans}
|
||||
\end{itemize}
|
||||
|
||||
\item Font Awesome Free License
|
||||
|
File diff suppressed because it is too large
Load Diff
2821
profiler/src/DroidSans.hpp
Normal file
2821
profiler/src/DroidSans.hpp
Normal file
File diff suppressed because it is too large
Load Diff
@ -48,7 +48,7 @@
|
||||
#include "../../server/IconsFontAwesome5.h"
|
||||
|
||||
#include "misc/freetype/imgui_freetype.h"
|
||||
#include "Arimo.hpp"
|
||||
#include "DroidSans.hpp"
|
||||
#include "FiraCodeRetina.hpp"
|
||||
#include "FontAwesomeSolid.hpp"
|
||||
#include "icon.hpp"
|
||||
@ -167,12 +167,12 @@ static void LoadFonts( float scale, ImFont*& cb_fixedWidth, ImFont*& cb_bigFont,
|
||||
configMerge.FontBuilderFlags = ImGuiFreeTypeBuilderFlags_LightHinting;
|
||||
|
||||
io.Fonts->Clear();
|
||||
io.Fonts->AddFontFromMemoryCompressedTTF( tracy::Arimo_compressed_data, tracy::Arimo_compressed_size, 15.0f * scale, &configBasic, rangesBasic );
|
||||
io.Fonts->AddFontFromMemoryCompressedTTF( tracy::DroidSans_compressed_data, tracy::DroidSans_compressed_size, 15.0f * scale, &configBasic, rangesBasic );
|
||||
io.Fonts->AddFontFromMemoryCompressedTTF( tracy::FontAwesomeSolid_compressed_data, tracy::FontAwesomeSolid_compressed_size, 14.0f * scale, &configMerge, rangesIcons );
|
||||
fixedWidth = cb_fixedWidth = io.Fonts->AddFontFromMemoryCompressedTTF( tracy::FiraCodeRetina_compressed_data, tracy::FiraCodeRetina_compressed_size, 15.0f * scale, &configBasic );
|
||||
bigFont = cb_bigFont = io.Fonts->AddFontFromMemoryCompressedTTF( tracy::Arimo_compressed_data, tracy::Arimo_compressed_size, 20.0f * scale, &configBasic );
|
||||
bigFont = cb_bigFont = io.Fonts->AddFontFromMemoryCompressedTTF( tracy::DroidSans_compressed_data, tracy::DroidSans_compressed_size, 20.0f * scale, &configBasic );
|
||||
io.Fonts->AddFontFromMemoryCompressedTTF( tracy::FontAwesomeSolid_compressed_data, tracy::FontAwesomeSolid_compressed_size, 19.0f * scale, &configMerge, rangesIcons );
|
||||
smallFont = cb_smallFont = io.Fonts->AddFontFromMemoryCompressedTTF( tracy::Arimo_compressed_data, tracy::Arimo_compressed_size, 10.0f * scale, &configBasic );
|
||||
smallFont = cb_smallFont = io.Fonts->AddFontFromMemoryCompressedTTF( tracy::DroidSans_compressed_data, tracy::DroidSans_compressed_size, 10.0f * scale, &configBasic );
|
||||
|
||||
ImGui_ImplOpenGL3_DestroyFontsTexture();
|
||||
ImGui_ImplOpenGL3_CreateFontsTexture();
|
||||
|
Loading…
Reference in New Issue
Block a user