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

Update ImGui to 1.84.1 + docking.

Browse Source
This commit is contained in:
Bartosz Taudul
2021-08-21 00:52:30 +02:00
parent c82bf3915b
commit 30445b656f
15 changed files with 1721 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/TracyImGui.hpp
+6 -10
View File
@@ -116,9 +116,9 @@ static const ImVec4 SyntaxColorsDimmed[] = {
{
if( disabled )
{
ImGui::PushStyleColor( ImGuiCol_Button, (ImVec4)ImColor( 0.3f, 0.3f, 0.3f, 1.0f ) );
ImGui::ButtonEx( label, ImVec2( 0, 0 ), ImGuiButtonFlags_Disabled );
ImGui::PopStyleColor( 1 );
ImGui::BeginDisabled();
ImGui::Button( label );
ImGui::EndDisabled();
return false;
}
else
@@ -131,13 +131,9 @@ static const ImVec4 SyntaxColorsDimmed[] = {
{
if( disabled )
{
ImGui::PushStyleColor( ImGuiCol_Button, (ImVec4)ImColor( 0.3f, 0.3f, 0.3f, 1.0f ) );
ImGuiContext& g = *GImGui;
float backup_padding_y = g.Style.FramePadding.y;
g.Style.FramePadding.y = 0.0f;
ImGui::ButtonEx( label, ImVec2( 0, 0 ), ImGuiButtonFlags_Disabled | ImGuiButtonFlags_AlignTextBaseLine );
g.Style.FramePadding.y = backup_padding_y;
ImGui::PopStyleColor( 1 );
ImGui::BeginDisabled();
ImGui::SmallButton( label );
ImGui::EndDisabled();
return false;
}
else
server/TracyView.cpp
+6 -6
View File
@@ -841,9 +841,9 @@ bool View::DrawImpl()
}
else
{
ImGui::PushStyleColor( ImGuiCol_Button, (ImVec4)ImColor( 0.3f, 0.3f, 0.3f, 1.0f ) );
ImGui::ButtonEx( MainWindowButtons[2], ImVec2( bw, 0 ), ImGuiButtonFlags_Disabled );
ImGui::PopStyleColor( 1 );
ImGui::BeginDisabled();
ImGui::ButtonEx( MainWindowButtons[2], ImVec2( bw, 0 ) );
ImGui::EndDisabled();
}
if( ImGui::BeginPopup( "viewMode" ) )
{
@@ -1589,9 +1589,9 @@ bool View::DrawConnection()
}
else
{
ImGui::PushStyleColor( ImGuiCol_Button, (ImVec4)ImColor( 0.3f, 0.3f, 0.3f, 1.0f ) );
ImGui::ButtonEx( stopStr, ImVec2( 0, 0 ), ImGuiButtonFlags_Disabled );
ImGui::PopStyleColor( 1 );
ImGui::BeginDisabled();
ImGui::Button( stopStr );
ImGui::EndDisabled();
}
ImGui::SameLine();