diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp index 1da5b97f..b1c7bf9a 100644 --- a/profiler/src/main.cpp +++ b/profiler/src/main.cpp @@ -244,11 +244,61 @@ int main( int argc, char** argv ) auto& style = ImGui::GetStyle(); style.WindowBorderSize = 1.f * dpiScale; style.FrameBorderSize = 1.f * dpiScale; - style.FrameRounding = 5.f * dpiScale; + style.FrameRounding = 4.f * dpiScale; style.ScrollbarSize *= dpiScale; style.Colors[ImGuiCol_ScrollbarBg] = ImVec4( 1, 1, 1, 0.03f ); - ImVec4 clear_color = ImColor(114, 144, 154); + style.Colors[ImGuiCol_Button] = ImVec4(0.30f, 0.30f, 0.30f, 1.00f); + style.Colors[ImGuiCol_ButtonHovered] = ImVec4(0.36f, 0.36f, 0.36f, 1.00f); + style.Colors[ImGuiCol_ButtonActive] = ImVec4(0.42f, 0.42f, 0.42f, 1.00f); + style.Colors[ImGuiCol_Border] = ImVec4(0.00f, 0.00f, 0.00f, 0.50f); + style.Colors[ImGuiCol_BorderShadow] = ImVec4(0.44f, 0.44f, 0.44f, 0.17f); + style.Colors[ImGuiCol_WindowBg] = ImVec4(0.18f, 0.18f, 0.18f, 1.00f); + style.Colors[ImGuiCol_TitleBg] = ImVec4(0.10f, 0.10f, 0.10f, 1.00f); + style.Colors[ImGuiCol_TitleBgActive] = ImVec4(0.28f, 0.28f, 0.28f, 1.00f); + style.Colors[ImGuiCol_TitleBgCollapsed] = ImVec4(0.06f, 0.06f, 0.06f, 0.50f); + style.Colors[ImGuiCol_PopupBg] = ImVec4(0.14f, 0.14f, 0.14f, 1.00f); + style.Colors[ImGuiCol_FrameBg] = ImVec4(0.28f, 0.28f, 0.28f, 1.00f); + style.Colors[ImGuiCol_FrameBgHovered] = ImVec4(0.34f, 0.34f, 0.34f, 1.00f); + style.Colors[ImGuiCol_FrameBgActive] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f); + style.Colors[ImGuiCol_CheckMark] = ImVec4(0.64f, 0.64f, 0.64f, 1.00f); + style.Colors[ImGuiCol_ResizeGrip] = ImVec4(0.40f, 0.40f, 0.40f, 0.25f); + style.Colors[ImGuiCol_ResizeGripHovered] = ImVec4(0.40f, 0.40f, 0.40f, 0.67f); + style.Colors[ImGuiCol_ResizeGripActive] = ImVec4(0.40f, 0.40f, 0.40f, 0.95f); + style.Colors[ImGuiCol_Header] = ImVec4(0.50f, 0.50f, 0.50f, 0.31f); + style.Colors[ImGuiCol_HeaderHovered] = ImVec4(0.50f, 0.50f, 0.50f, 0.80f); + style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); + style.Colors[ImGuiCol_SliderGrab] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); + style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.70f, 0.70f, 0.70f, 1.00f); + style.Colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 1.00f); + style.Colors[ImGuiCol_TextDisabled] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); + style.Colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f); + style.Colors[ImGuiCol_ScrollbarBg] = ImVec4(0.02f, 0.02f, 0.02f, 0.53f); + style.Colors[ImGuiCol_ScrollbarGrab] = ImVec4(0.31f, 0.31f, 0.31f, 1.00f); + style.Colors[ImGuiCol_ScrollbarGrabHovered] = ImVec4(0.41f, 0.41f, 0.41f, 1.00f); + style.Colors[ImGuiCol_ScrollbarGrabActive] = ImVec4(0.51f, 0.51f, 0.51f, 1.00f); + style.Colors[ImGuiCol_Separator] = ImVec4(0.26f, 0.26f, 0.26f, 1.00f); + style.Colors[ImGuiCol_SeparatorHovered] = ImVec4(0.32f, 0.32f, 0.32f, 1.00f); + style.Colors[ImGuiCol_SeparatorActive] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f); + + style.Colors[ImGuiCol_Tab] = ImLerp(style.Colors[ImGuiCol_Header], style.Colors[ImGuiCol_TitleBgActive], 0.80f); + style.Colors[ImGuiCol_TabHovered] = style.Colors[ImGuiCol_HeaderHovered]; + style.Colors[ImGuiCol_TabActive] = ImLerp(style.Colors[ImGuiCol_HeaderActive], style.Colors[ImGuiCol_TitleBgActive], 0.60f); + style.Colors[ImGuiCol_TabUnfocused] = ImLerp(style.Colors[ImGuiCol_Tab], style.Colors[ImGuiCol_TitleBg], 0.80f); + style.Colors[ImGuiCol_TabUnfocusedActive] = ImLerp(style.Colors[ImGuiCol_TabActive], style.Colors[ImGuiCol_TitleBg], 0.40f); + + style.Colors[ImGuiCol_PlotLines] = ImVec4(0.61f, 0.61f, 0.61f, 1.00f); + style.Colors[ImGuiCol_PlotLinesHovered] = ImVec4(1.00f, 0.43f, 0.35f, 1.00f); + style.Colors[ImGuiCol_PlotHistogram] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f); + style.Colors[ImGuiCol_PlotHistogramHovered] = ImVec4(0.50f, 0.50f, 0.50f, 1.00f); + style.Colors[ImGuiCol_TextSelectedBg] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f); + style.Colors[ImGuiCol_DragDropTarget] = ImVec4(0.60f, 0.60f, 0.60f, 0.90f); + style.Colors[ImGuiCol_NavHighlight] = ImVec4(0.40f, 0.40f, 0.40f, 1.00f); + style.Colors[ImGuiCol_NavWindowingHighlight] = ImVec4(1.00f, 1.00f, 1.00f, 0.70f); + style.Colors[ImGuiCol_NavWindowingDimBg] = ImVec4(0.14f, 0.14f, 0.14f, 0.50f); + style.Colors[ImGuiCol_ModalWindowDimBg] = ImVec4(0.14f, 0.14f, 0.14f, 0.75f); + + ImVec4 clear_color = ImColor(28, 28, 28); char addr[1024] = { "127.0.0.1" }; @@ -363,7 +413,7 @@ int main( int argc, char** argv ) } setlocale( LC_NUMERIC, "C" ); - style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.129f, 0.137f, 0.11f, 1.f ); + style.Colors[ImGuiCol_WindowBg] = ImVec4(0.18f, 0.18f, 0.18f, 1.00f); ImGui::Begin( "Get started", nullptr, ImGuiWindowFlags_AlwaysAutoResize ); char buf[128]; sprintf( buf, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch ); diff --git a/server/TracyView.cpp b/server/TracyView.cpp index 567ff315..3b8dcf88 100644 --- a/server/TracyView.cpp +++ b/server/TracyView.cpp @@ -433,10 +433,11 @@ bool View::DrawImpl() const auto wrPrev = style.WindowRounding; const auto wbsPrev = style.WindowBorderSize; const auto wpPrev = style.WindowPadding; + const auto bgPrev = style.Colors[ImGuiCol_WindowBg]; style.WindowRounding = 0.f; style.WindowBorderSize = 0.f; style.WindowPadding = ImVec2( 4.f, 4.f ); - style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.129f, 0.137f, 0.11f, 1.f ); + style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.16f, 0.16f, 0.16f, 1.f ); ImGui::SetNextWindowPos( ImVec2( 0, 0 ) ); ImGui::SetNextWindowSize( ImVec2( m_rootWidth, m_rootHeight ) ); @@ -445,7 +446,7 @@ bool View::DrawImpl() style.WindowRounding = wrPrev; style.WindowBorderSize = wbsPrev; style.WindowPadding = wpPrev; - style.Colors[ImGuiCol_WindowBg] = ImVec4( 0.11f, 0.11f, 0.08f, 1.f ); + style.Colors[ImGuiCol_WindowBg] = bgPrev; #else char tmp[2048]; sprintf( tmp, "%s###Profiler", m_worker.GetCaptureName().c_str() );