mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-29 08:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display changes in source files in compare menu.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-12-23 19:14:31 +01:00
parent 205930fd2c
commit 1eaebb44cb
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
server/TracyView_Compare.cpp
View File

@ -309,13 +309,13 @@ void View::DrawCompare()
ImGui::Separator(); ImGui::Separator();
ImGui::BeginChild( "##compare" ); ImGui::BeginChild( "##compare" );
const auto& tfc = m_worker.GetSourceFileCache();
const auto& ofc = m_compare.second->GetSourceFileCache();
if( !m_compare.diffDone ) if( !m_compare.diffDone )
{ {
m_compare.diffDone = true; m_compare.diffDone = true;
const auto& tfc = m_worker.GetSourceFileCache();
const auto& ofc = m_compare.second->GetSourceFileCache();
if( !tfc.empty() && !ofc.empty() ) if( !tfc.empty() && !ofc.empty() )
{ {
for( auto& tv : tfc ) for( auto& tv : tfc )
@ -351,6 +351,79 @@ void View::DrawCompare()
std::sort( m_compare.diffs.begin(), m_compare.diffs.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs.first, rhs.first ) < 0; } ); std::sort( m_compare.diffs.begin(), m_compare.diffs.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs.first, rhs.first ) < 0; } );
} }
} }
if( m_compare.thisUnique.empty() && m_compare.secondUnique.empty() && m_compare.diffs.empty() )
{
ImGui::TextUnformatted( "Source files are identical." );
}
else
{
if( !m_compare.thisUnique.empty() )
{
const auto expand = ImGui::TreeNodeEx( ICON_FA_FILE_CIRCLE_XMARK " Deleted files", ImGuiTreeNodeFlags_DefaultOpen );
ImGui::SameLine();
ImGui::TextDisabled( "(%s)", RealToString( m_compare.thisUnique.size() ) );
if( expand )
{
for( auto& v : m_compare.thisUnique )
{
if( ImGui::TreeNode( v ) )
{
auto it = tfc.find( v );
assert( it != tfc.end() );
ImGui::PushFont( m_fixedFont );
PrintFile( it->second.data, it->second.len, 0xFF6666FF );
ImGui::PopFont();
ImGui::TreePop();
}
}
ImGui::TreePop();
}
}
if( !m_compare.secondUnique.empty() )
{
const auto expand = ImGui::TreeNodeEx( ICON_FA_FILE_CIRCLE_PLUS " Added files", ImGuiTreeNodeFlags_DefaultOpen );
ImGui::SameLine();
ImGui::TextDisabled( "(%s)", RealToString( m_compare.secondUnique.size() ) );
if( expand )
{
for( auto& v : m_compare.secondUnique )
{
if( ImGui::TreeNode( v ) )
{
auto it = ofc.find( v );
assert( it != ofc.end() );
ImGui::PushFont( m_fixedFont );
PrintFile( it->second.data, it->second.len, 0xFF66DD66 );
ImGui::PopFont();
ImGui::TreePop();
}
}
ImGui::TreePop();
}
}
if( !m_compare.diffs.empty() )
{
const auto expand = ImGui::TreeNodeEx( ICON_FA_FILE_PEN " Changed files", ImGuiTreeNodeFlags_DefaultOpen );
ImGui::SameLine();
ImGui::TextDisabled( "(%s)", RealToString( m_compare.diffs.size() ) );
if( expand )
{
for( auto& v : m_compare.diffs )
{
if( ImGui::TreeNode( v.first ) )
{
ImGui::PushFont( m_fixedFont );
PrintDiff( v.second );
ImGui::PopFont();
ImGui::TreePop();
}
}
ImGui::TreePop();
}
}
}
} }
else else
{ {