zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Merge font awesome into the default font.

Browse Source
This commit is contained in:
Bartosz Taudul
2018-08-17 17:56:55 +02:00
parent 337111f948
commit 3d0b9da592
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/src/main.cpp
+10 -3
View File
@@ -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();