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

Load fixed width font (the default ImGui one for now).

Browse Source
This commit is contained in:
Bartosz Taudul 2018-08-17 15:18:37 +02:00
parent 5cd61c4b07
commit c503e3760c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
profiler/src/main.cpp
View File

@ -94,6 +94,7 @@ int main( int argc, char** argv )
ImGuiIO& io = ImGui::GetIO(); 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, ranges );
auto fixedWidth = io.Fonts->AddFontDefault();
ImGui::StyleColorsDark(); ImGui::StyleColorsDark();
auto& style = ImGui::GetStyle(); auto& style = ImGui::GetStyle();
@ -146,7 +147,7 @@ int main( int argc, char** argv )
ImGui::InputText( "Address", addr, 1024 ); ImGui::InputText( "Address", addr, 1024 );
if( ImGui::Button( "Connect" ) && *addr && !loadThread.joinable() ) if( ImGui::Button( "Connect" ) && *addr && !loadThread.joinable() )
{ {
view = std::make_unique<tracy::View>( addr ); view = std::make_unique<tracy::View>( addr, fixedWidth );
} }
ImGui::Separator(); ImGui::Separator();
if( ImGui::Button( "Open saved trace" ) && !loadThread.joinable() ) if( ImGui::Button( "Open saved trace" ) && !loadThread.joinable() )
@ -160,10 +161,10 @@ int main( int argc, char** argv )
auto f = std::shared_ptr<tracy::FileRead>( tracy::FileRead::Open( fn ) ); auto f = std::shared_ptr<tracy::FileRead>( tracy::FileRead::Open( fn ) );
if( f ) if( f )
{ {
loadThread = std::thread( [&view, f, &badVer] { loadThread = std::thread( [&view, f, &badVer, fixedWidth] {
try try
{ {
view = std::make_unique<tracy::View>( *f ); view = std::make_unique<tracy::View>( *f, fixedWidth );
} }
catch( const tracy::UnsupportedVersion& e ) catch( const tracy::UnsupportedVersion& e )
{ {