diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index c81551ec..e4f9b485 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -154,6 +154,7 @@ + diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters index a8e2df90..d8b80380 100644 --- a/profiler/build/win32/Tracy.vcxproj.filters +++ b/profiler/build/win32/Tracy.vcxproj.filters @@ -206,6 +206,9 @@ imguicolortextedit + + src + diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp index 3ed53000..10a4ed4e 100644 --- a/profiler/src/main.cpp +++ b/profiler/src/main.cpp @@ -21,8 +21,8 @@ #include "../../server/TracyWorker.hpp" #include "../../server/TracyVersion.hpp" - #include "Arimo.hpp" +#include "FontAwesomeSolid.hpp" static void glfw_error_callback(int error, const char* description) { @@ -97,14 +97,21 @@ int main( int argc, char** argv ) ImGui::CreateContext(); ImGui_ImplGlfwGL3_Init(window, true); - static const ImWchar ranges[] = { + static const ImWchar rangesBasic[] = { 0x0020, 0x00FF, // Basic Latin + Latin Supplement 0x03BC, 0x03BC, // micro 0, }; + static const ImWchar rangesIcons[] = { + 0xF071, 0xF071, + 0 + }; + ImFontConfig configMerge; + configMerge.MergeMode = true; ImGuiIO& io = ImGui::GetIO(); - io.Fonts->AddFontFromMemoryCompressedTTF( tracy::Arimo_compressed_data, tracy::Arimo_compressed_size, 15.0f * dpiScale, nullptr, ranges ); + io.Fonts->AddFontFromMemoryCompressedTTF( tracy::Arimo_compressed_data, tracy::Arimo_compressed_size, 15.0f * dpiScale, nullptr, rangesBasic ); + io.Fonts->AddFontFromMemoryCompressedTTF( tracy::FontAwesomeSolid_compressed_data, tracy::FontAwesomeSolid_compressed_size, 15.0f * dpiScale, &configMerge, rangesIcons ); auto fixedWidth = io.Fonts->AddFontDefault(); ImGui::StyleColorsDark();