mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

Added saving of user ui scale in the global configuration. Moved userScale into s_config. Prevented "Get started" and "Loading trace..." windows from having their position saved between restarts, because if you change scale and then restart, they might get pushed to the edge of the window, which is confusing.

Browse Source
This commit is contained in:
Simon van Bernem 2025-04-27 21:33:08 +02:00
parent cc0c53496d
commit a277453acb
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
profiler/src/main.cpp
View File

@ -101,7 +101,6 @@ static std::atomic<ViewShutdown> viewShutdown { ViewShutdown::False };
static double animTime = 0; static double animTime = 0;
static float dpiScale = -1.f; static float dpiScale = -1.f;
static bool dpiScaleOverriddenFromEnv = false; static bool dpiScaleOverriddenFromEnv = false;
static float userScale = 1.f;
static float prevScale = 1.f; static float prevScale = 1.f;
static int dpiChanged = 0; static int dpiChanged = 0;
static bool dpiFirstSetup = true; static bool dpiFirstSetup = true;
@ -162,7 +161,7 @@ static void ScaleWindow(ImGuiWindow* window, float scale)
static void SetupDPIScale() static void SetupDPIScale()
{ {
auto scale = dpiScale * userScale; auto scale = dpiScale * s_config.userScale;
if( !dpiFirstSetup && prevScale == scale ) return; if( !dpiFirstSetup && prevScale == scale ) return;
dpiFirstSetup = false; dpiFirstSetup = false;
@ -204,12 +203,6 @@ static void SetupDPIScale()
for( auto& w : ctx->Windows ) ScaleWindow( w, ratio ); for( auto& w : ctx->Windows ) ScaleWindow( w, ratio );
} }
static void SetupScaleCallback( float scale )
{
userScale = scale;
RunOnMainThread( []{ SetupDPIScale(); }, true );
}
static int IsBusy() static int IsBusy()
{ {
if( loadThread.joinable() ) return 2; if( loadThread.joinable() ) return 2;
@ -237,6 +230,9 @@ static void LoadConfig()
if( ini_sget( ini, "memory", "percent", "%d", &v ) && v >= 1 && v < 1000 ) s_config.memoryLimitPercent = v; if( ini_sget( ini, "memory", "percent", "%d", &v ) && v >= 1 && v < 1000 ) s_config.memoryLimitPercent = v;
if( ini_sget( ini, "achievements", "enabled", "%d", &v ) ) s_config.achievements = v; if( ini_sget( ini, "achievements", "enabled", "%d", &v ) ) s_config.achievements = v;
if( ini_sget( ini, "achievements", "asked", "%d", &v ) ) s_config.achievementsAsked = v; if( ini_sget( ini, "achievements", "asked", "%d", &v ) ) s_config.achievementsAsked = v;
if( ini_sget( ini, "ui", "saveUserScale", "%d", &v ) ) s_config.saveUserScale = v;
if( ini_sget( ini, "ui", "userScale", "%lf", &v1 ) && v1 > 0.0 && s_config.saveUserScale ) s_config.userScale = v1;
ini_free( ini ); ini_free( ini );
} }
@ -267,10 +263,21 @@ static bool SaveConfig()
fprintf( f, "enabled = %i\n", (int)s_config.achievements ); fprintf( f, "enabled = %i\n", (int)s_config.achievements );
fprintf( f, "asked = %i\n", (int)s_config.achievementsAsked ); fprintf( f, "asked = %i\n", (int)s_config.achievementsAsked );
fprintf( f, "\n[ui]\n" );
fprintf( f, "saveUserScale = %i\n", (int)s_config.saveUserScale );
fprintf( f, "userScale = %lf\n", s_config.userScale );
fclose( f ); fclose( f );
return true; return true;
} }
static void SetupScaleCallback( float scale )
{
s_config.userScale = scale;
if ( s_config.saveUserScale ) SaveConfig();
RunOnMainThread( []{ SetupDPIScale(); }, true );
}
static void ScaleChanged( float scale ) static void ScaleChanged( float scale )
{ {
if( dpiScaleOverriddenFromEnv ) return; if( dpiScaleOverriddenFromEnv ) return;
@ -697,7 +704,7 @@ static void DrawContents()
auto& style = ImGui::GetStyle(); auto& style = ImGui::GetStyle();
style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.129f, 0.137f, 0.11f, 1.f ); style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.129f, 0.137f, 0.11f, 1.f );
ImGui::Begin( "Get started", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse ); ImGui::Begin( "Get started", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings );
char buf[128]; char buf[128];
sprintf( buf, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch ); sprintf( buf, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch );
ImGui::PushFont( s_bigFont ); ImGui::PushFont( s_bigFont );
@ -839,6 +846,7 @@ static void DrawContents()
ImGui::Spacing(); ImGui::Spacing();
if( ImGui::Checkbox( "Enable achievements", &s_config.achievements ) ) SaveConfig(); if( ImGui::Checkbox( "Enable achievements", &s_config.achievements ) ) SaveConfig();
if( ImGui::Checkbox( "save UI scale", &s_config.saveUserScale) ) SaveConfig();
ImGui::PopStyleVar(); ImGui::PopStyleVar();
ImGui::TreePop(); ImGui::TreePop();
@ -1267,7 +1275,7 @@ static void DrawContents()
{ {
ImGui::OpenPopup( "Loading trace..." ); ImGui::OpenPopup( "Loading trace..." );
} }
if( ImGui::BeginPopupModal( "Loading trace...", nullptr, ImGuiWindowFlags_AlwaysAutoResize ) ) if( ImGui::BeginPopupModal( "Loading trace...", nullptr, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings) )
{ {
ImGui::PushFont( s_bigFont ); ImGui::PushFont( s_bigFont );
tracy::TextCentered( ICON_FA_HOURGLASS_HALF ); tracy::TextCentered( ICON_FA_HOURGLASS_HALF );

2
profiler/src/profiler/TracyConfig.hpp
View File

@ -20,6 +20,8 @@ struct Config
int dynamicColors = 1; int dynamicColors = 1;
bool forceColors = false; bool forceColors = false;
int shortenName = (int)ShortenName::NoSpaceAndNormalize; int shortenName = (int)ShortenName::NoSpaceAndNormalize;
bool saveUserScale = false;
float userScale = 1.0f;
}; };
} }