From 7fb9bde9e9a4772611c7e7ad33b2f0ccbca8a267 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Fri, 12 Jul 2019 19:16:56 +0200
Subject: [PATCH] Pass big font to TracyView.

---
 profiler/src/main.cpp | 8 ++++----
 server/TracyView.cpp  | 6 ++++--
 server/TracyView.hpp  | 8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp
index 8ee08b79..8a5e365f 100644
--- a/profiler/src/main.cpp
+++ b/profiler/src/main.cpp
@@ -449,7 +449,7 @@ int main( int argc, char** argv )
                 }
                 connHistVec = RebuildConnectionHistory( connHistMap );
 
-                view = std::make_unique<tracy::View>( addr, fixedWidth, SetWindowTitleCallback );
+                view = std::make_unique<tracy::View>( addr, fixedWidth, bigFont, SetWindowTitleCallback );
             }
             ImGui::SameLine( 0, ImGui::GetFontSize() * 2 );
             if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open saved trace" ) && !loadThread.joinable() )
@@ -463,10 +463,10 @@ int main( int argc, char** argv )
                         auto f = std::shared_ptr<tracy::FileRead>( tracy::FileRead::Open( fn ) );
                         if( f )
                         {
-                            loadThread = std::thread( [&view, f, &badVer, fixedWidth] {
+                            loadThread = std::thread( [&view, f, &badVer, fixedWidth, bigFont] {
                                 try
                                 {
-                                    view = std::make_unique<tracy::View>( *f, fixedWidth, SetWindowTitleCallback );
+                                    view = std::make_unique<tracy::View>( *f, fixedWidth, bigFont, SetWindowTitleCallback );
                                 }
                                 catch( const tracy::UnsupportedVersion& e )
                                 {
@@ -514,7 +514,7 @@ int main( int argc, char** argv )
                     if( badProto ) flags |= ImGuiSelectableFlags_Disabled;
                     if( ImGui::Selectable( name->second.c_str(), &sel, flags ) && !loadThread.joinable() )
                     {
-                        view = std::make_unique<tracy::View>( v.second.address.c_str(), fixedWidth, SetWindowTitleCallback );
+                        view = std::make_unique<tracy::View>( v.second.address.c_str(), fixedWidth, bigFont, SetWindowTitleCallback );
                     }
                     ImGui::NextColumn();
                     const auto acttime = ( v.second.activeTime + ( time - v.second.time ) / 1000 ) * 1000000000ll;
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 7a948729..207c3ed6 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -100,12 +100,13 @@ enum { MinFrameSize = 5 };
 
 static View* s_instance = nullptr;
 
-View::View( const char* addr, ImFont* fixedWidth, SetTitleCallback stcb )
+View::View( const char* addr, ImFont* fixedWidth, ImFont* bigFont, SetTitleCallback stcb )
     : m_worker( addr )
     , m_staticView( false )
     , m_pause( false )
     , m_frames( nullptr )
     , m_textEditorFont( fixedWidth )
+    , m_bigFont( bigFont )
     , m_stcb( stcb )
 {
     assert( s_instance == nullptr );
@@ -114,12 +115,13 @@ View::View( const char* addr, ImFont* fixedWidth, SetTitleCallback stcb )
     InitTextEditor();
 }
 
-View::View( FileRead& f, ImFont* fixedWidth, SetTitleCallback stcb )
+View::View( FileRead& f, ImFont* fixedWidth, ImFont* bigFont, SetTitleCallback stcb )
     : m_worker( f )
     , m_staticView( true )
     , m_pause( true )
     , m_frames( m_worker.GetFramesBase() )
     , m_textEditorFont( fixedWidth )
+    , m_bigFont( bigFont )
     , m_stcb( stcb )
 {
     assert( s_instance == nullptr );
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 5ea4f567..bacc372c 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -61,9 +61,9 @@ public:
 
     using SetTitleCallback = void(*)( const char* );
 
-    View( ImFont* fixedWidth = nullptr, SetTitleCallback stcb = nullptr ) : View( "127.0.0.1", fixedWidth, stcb ) {}
-    View( const char* addr, ImFont* fixedWidth = nullptr, SetTitleCallback stcb = nullptr );
-    View( FileRead& f, ImFont* fixedWidth = nullptr, SetTitleCallback stcb = nullptr );
+    View( ImFont* fixedWidth = nullptr, ImFont* bigFont = nullptr, SetTitleCallback stcb = nullptr ) : View( "127.0.0.1", fixedWidth, bigFont, stcb ) {}
+    View( const char* addr, ImFont* fixedWidth = nullptr, ImFont* bigFont = nullptr, SetTitleCallback stcb = nullptr );
+    View( FileRead& f, ImFont* fixedWidth = nullptr, ImFont* bigFont = nullptr, SetTitleCallback stcb = nullptr );
     ~View();
 
     static bool Draw();
@@ -312,6 +312,8 @@ private:
     ImFont* m_textEditorFont;
     bool m_textEditorWhitespace = true;
 
+    ImFont* m_bigFont;
+
     float m_rootWidth, m_rootHeight;
     SetTitleCallback m_stcb;
     bool m_titleSet = false;