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

Pass big font to TracyView.

Browse Source
This commit is contained in:
Bartosz Taudul
2019-07-12 19:16:56 +02:00
parent fc28f827bc
commit 7fb9bde9e9
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyView.cpp
+4 -2
View File
@@ -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 );
server/TracyView.hpp
+5 -3
View File
@@ -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;