From e105d2d96c99baacb660f1aa0f042d8fe3364870 Mon Sep 17 00:00:00 2001 From: Terence Rokop Date: Sat, 26 Jun 2021 10:40:28 -0700 Subject: [PATCH] Aesthetic fixes to accumulation mode combo box Shorter text fields and more spacing. --- server/TracyView.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 8950de86..1c900ca4 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -12273,10 +12273,13 @@ struct SrcLocZonesSlim void View::AccumulationModeComboBox() { - ImGui::TextUnformatted( "Accumulation mode" ); ImGui::SameLine(); - const char* accumulationModeTable = m_statMode == 0 ? "Self only\0Including children\0Non-reentrant\0" : "Self only\0Including children\0"; - ImGui::SetNextItemWidth( ImGui::CalcTextSize( "Including children" ).x + ImGui::GetTextLineHeight() * 2 ); + ImGui::Spacing(); + ImGui::SameLine(); + ImGui::TextUnformatted( "Timing" ); + ImGui::SameLine(); + const char* accumulationModeTable = m_statMode == 0 ? "Self only\0With children\0Non-reentrant\0" : "Self only\0With children\0"; + ImGui::SetNextItemWidth( ImGui::CalcTextSize( "Non-reentrant" ).x + ImGui::GetTextLineHeight() * 2 ); if ( m_statMode != 0 && m_statAccumulationMode == AccumulationMode::NonReentrantChildren ) { m_statAccumulationMode = AccumulationMode::SelfOnly; @@ -12284,6 +12287,9 @@ void View::AccumulationModeComboBox() int accumulationMode = static_cast( m_statAccumulationMode ); ImGui::Combo( "##accumulationMode", &accumulationMode, accumulationModeTable ); m_statAccumulationMode = static_cast( accumulationMode ); + ImGui::SameLine(); + ImGui::Spacing(); + ImGui::SameLine(); } void View::DrawStatistics() @@ -12499,9 +12505,6 @@ void View::DrawStatistics() ImGui::Spacing(); ImGui::SameLine(); TextFocused( "Visible zones:", RealToString( srcloc.size() ) ); - ImGui::SameLine(); - ImGui::Spacing(); - ImGui::SameLine(); AccumulationModeComboBox(); } else