mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-05-01 05:03:53 +00:00
Code Issues Releases Wiki Activity

Disable color box drag and drop.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-09-11 18:48:28 +02:00
parent 2cec6f5482
commit 0850145811
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyImGui.hpp
View File

@ -70,7 +70,7 @@ namespace tracy
static inline void SmallColorBox( uint32_t color ) static inline void SmallColorBox( uint32_t color )
{ {
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) ); ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
ImGui::ColorButton( "c1", ImVec4( (color & 0xFF) / 255.f, ((color>>8) & 0xFF ) / 255.f, ((color>>16) & 0xFF ) / 255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c1", ImVec4( (color & 0xFF) / 255.f, ((color>>8) & 0xFF ) / 255.f, ((color>>16) & 0xFF ) / 255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }

18
server/TracyView.cpp
View File

@ -7655,18 +7655,18 @@ void View::DrawFindZone()
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) ); ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
ImGui::Checkbox( "###draw1", &m_findZone.drawAvgMed ); ImGui::Checkbox( "###draw1", &m_findZone.drawAvgMed );
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c1", ImVec4( 0xFF/255.f, 0x44/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c1", ImVec4( 0xFF/255.f, 0x44/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "Average time" ); ImGui::TextUnformatted( "Average time" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c2", ImVec4( 0x44/255.f, 0xAA/255.f, 0xFF/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c2", ImVec4( 0x44/255.f, 0xAA/255.f, 0xFF/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "Median time" ); ImGui::TextUnformatted( "Median time" );
ImGui::Checkbox( "###draw2", &m_findZone.drawSelAvgMed ); ImGui::Checkbox( "###draw2", &m_findZone.drawSelAvgMed );
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c3", ImVec4( 0xFF/255.f, 0xAA/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c3", ImVec4( 0xFF/255.f, 0xAA/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
if( m_findZone.selGroup != m_findZone.Unselected ) if( m_findZone.selGroup != m_findZone.Unselected )
{ {
@ -7679,7 +7679,7 @@ void View::DrawFindZone()
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c4", ImVec4( 0x44/255.f, 0xDD/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c4", ImVec4( 0x44/255.f, 0xDD/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
if( m_findZone.selGroup != m_findZone.Unselected ) if( m_findZone.selGroup != m_findZone.Unselected )
{ {
@ -9007,7 +9007,7 @@ void View::DrawCompare()
ImGui::Button( ICON_FA_LEMON ); ImGui::Button( ICON_FA_LEMON );
ImGui::PopStyleColor( 4 ); ImGui::PopStyleColor( 4 );
#else #else
ImGui::ColorButton( "c1", ImVec4( 0xDD/255.f, 0xDD/255.f, 0x22/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c1", ImVec4( 0xDD/255.f, 0xDD/255.f, 0x22/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
#endif #endif
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "This trace" ); ImGui::TextUnformatted( "This trace" );
@ -9023,7 +9023,7 @@ void View::DrawCompare()
ImGui::Button( ICON_FA_GEM ); ImGui::Button( ICON_FA_GEM );
ImGui::PopStyleColor( 4 ); ImGui::PopStyleColor( 4 );
#else #else
ImGui::ColorButton( "c2", ImVec4( 0xDD/255.f, 0x22/255.f, 0x22/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c2", ImVec4( 0xDD/255.f, 0x22/255.f, 0x22/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
#endif #endif
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "External trace" ); ImGui::TextUnformatted( "External trace" );
@ -9031,7 +9031,7 @@ void View::DrawCompare()
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c3", ImVec4( 0x44/255.f, 0xBB/255.f, 0xBB/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c3", ImVec4( 0x44/255.f, 0xBB/255.f, 0xBB/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "Overlap" ); ImGui::TextUnformatted( "Overlap" );
@ -10020,13 +10020,13 @@ void View::DrawInfo()
ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) ); ImGui::PushStyleVar( ImGuiStyleVar_FramePadding, ImVec2( 0, 0 ) );
ImGui::Checkbox( "###draw1", &m_frameSortData.drawAvgMed ); ImGui::Checkbox( "###draw1", &m_frameSortData.drawAvgMed );
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c1", ImVec4( 0xFF/255.f, 0x44/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c1", ImVec4( 0xFF/255.f, 0x44/255.f, 0x44/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "Average time" ); ImGui::TextUnformatted( "Average time" );
ImGui::SameLine(); ImGui::SameLine();
ImGui::Spacing(); ImGui::Spacing();
ImGui::SameLine(); ImGui::SameLine();
ImGui::ColorButton( "c2", ImVec4( 0x44/255.f, 0x88/255.f, 0xFF/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip ); ImGui::ColorButton( "c2", ImVec4( 0x44/255.f, 0x88/255.f, 0xFF/255.f, 1.f ), ImGuiColorEditFlags_NoTooltip | ImGuiColorEditFlags_NoDragDrop );
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextUnformatted( "Median time" ); ImGui::TextUnformatted( "Median time" );
ImGui::PopStyleVar(); ImGui::PopStyleVar();