From 3c2428ca8fcffb531d6238861bdc456cd75adff1 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Mon, 24 Feb 2025 23:05:50 -0500 Subject: [PATCH] Add build info separator --- .../Private/CogEngineWindow_BuildInfo.cpp | 29 ++++++++++++------- .../Public/CogEngineWindow_BuildInfo.h | 4 +++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_BuildInfo.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_BuildInfo.cpp index 8feb7a7..18a0391 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_BuildInfo.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_BuildInfo.cpp @@ -86,7 +86,12 @@ void FCogEngineWindow_BuildInfo::RenderContent() FCogWidgets::SetNextItemToShortWidth(); ImGui::SliderInt("Rounding", &Config->Rounding, 0, 12); - + + if (FCogWidgets::InputText("Separator", Config->Separator)) + { + BuildText(); + } + constexpr ImGuiColorEditFlags ColorEditFlags = ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf; FCogImguiHelper::ColorEdit4("Background Color", Config->BackgroundColor, ColorEditFlags); FCogImguiHelper::ColorEdit4("Border Color", Config->BorderColor, ColorEditFlags); @@ -104,14 +109,18 @@ void FCogEngineWindow_BuildInfo::RenderContent() void FCogEngineWindow_BuildInfo::BuildText() { FStringBuilderBase S; - if (Config->ShowBranchName) { S.Append(BuildSettings::GetBranchName()); S.Append(" "); } - if (Config->ShowBuildDate) { S.Append(BuildSettings::GetBuildDate()); S.Append(" "); } - if (Config->ShowBuildConfiguration) { S.Append(LexToString(FApp::GetBuildConfiguration())); S.Append(" "); } - if (Config->ShowBuildTargetType) { S.Append(LexToString(FApp::GetBuildTargetType())); S.Append(" "); } - if (Config->ShowBuildUser) { S.Append(BuildSettings::GetBuildUser()); S.Append(" "); } - if (Config->ShowBuildMachine) { S.Append(BuildSettings::GetBuildMachine()); S.Append(" "); } - if (Config->ShowCurrentChangelist) { S.Appendf(TEXT("%d"), BuildSettings::GetCurrentChangelist()); S.Append(" "); } - if (Config->ShowCompatibleChangelist) { S.Appendf(TEXT("%d"),BuildSettings::GetCompatibleChangelist()); } + bool AddSeparator = false; - Text = FString(S).TrimEnd(); + if (Config->ShowBranchName) { S.Append(BuildSettings::GetBranchName()); S.Append(Config->Separator); } + if (Config->ShowBuildDate) { S.Append(BuildSettings::GetBuildDate()); S.Append(Config->Separator); } + if (Config->ShowBuildConfiguration) { S.Append(LexToString(FApp::GetBuildConfiguration())); S.Append(Config->Separator); } + if (Config->ShowBuildTargetType) { S.Append(LexToString(FApp::GetBuildTargetType())); S.Append(Config->Separator); } + if (Config->ShowBuildUser) { S.Append(BuildSettings::GetBuildUser()); S.Append(Config->Separator); } + if (Config->ShowBuildMachine) { S.Append(BuildSettings::GetBuildMachine()); S.Append(Config->Separator); } + if (Config->ShowCurrentChangelist) { S.Appendf(TEXT("%d"), BuildSettings::GetCurrentChangelist()); S.Append(Config->Separator); } + if (Config->ShowCompatibleChangelist) { S.Appendf(TEXT("%d"),BuildSettings::GetCompatibleChangelist()); S.Append(Config->Separator); } + + S.RemoveSuffix(Config->Separator.Len()); + + Text = FString(S); } \ No newline at end of file diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_BuildInfo.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_BuildInfo.h index 0969dd1..58cedcd 100644 --- a/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_BuildInfo.h +++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineWindow_BuildInfo.h @@ -79,6 +79,9 @@ public: UPROPERTY(Config) int32 Rounding = 6; + + UPROPERTY(Config) + FString Separator = "|"; UPROPERTY(Config) FColor BackgroundColor = FColor(0, 0, 0, 80); @@ -107,6 +110,7 @@ public: Alignment = { 0, 1 }; Padding = { 10, 10 }; Rounding = 6; + Separator = " | "; BackgroundColor = FColor(0, 0, 0, 80); BorderColor = FColor(255, 255, 255, 50); TextColor = FColor(255, 255, 255, 100);