mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 16:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Arimo with Droid Sans.

Browse Source
This commit is contained in:
Bartosz Taudul 2021-11-20 01:14:46 +01:00
parent d0d0aca758
commit cccce5534c
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
4 changed files with 2826 additions and 6579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/tracy.tex
View File

@ -3639,7 +3639,7 @@ The following libraries are included with and used by the Tracy Profiler. Entrie
\item Apache license 2.0 \item Apache license 2.0
\begin{itemize} \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} \end{itemize}
\item Font Awesome Free License \item Font Awesome Free License

6574
profiler/src/Arimo.hpp
View File

File diff suppressed because it is too large Load Diff

2821
profiler/src/DroidSans.hpp Normal file
View File

File diff suppressed because it is too large Load Diff

8
profiler/src/main.cpp
View File

@ -48,7 +48,7 @@
#include "../../server/IconsFontAwesome5.h" #include "../../server/IconsFontAwesome5.h"
#include "misc/freetype/imgui_freetype.h" #include "misc/freetype/imgui_freetype.h"
#include "Arimo.hpp" #include "DroidSans.hpp"
#include "FiraCodeRetina.hpp" #include "FiraCodeRetina.hpp"
#include "FontAwesomeSolid.hpp" #include "FontAwesomeSolid.hpp"
#include "icon.hpp" #include "icon.hpp"
@ -167,12 +167,12 @@ static void LoadFonts( float scale, ImFont*& cb_fixedWidth, ImFont*& cb_bigFont,
configMerge.FontBuilderFlags = ImGuiFreeTypeBuilderFlags_LightHinting; configMerge.FontBuilderFlags = ImGuiFreeTypeBuilderFlags_LightHinting;
io.Fonts->Clear(); 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 ); 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 ); 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 ); 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_DestroyFontsTexture();
ImGui_ImplOpenGL3_CreateFontsTexture(); ImGui_ImplOpenGL3_CreateFontsTexture();