New UImGuiTheme release and updated client-side bar

Author: Madman10K

Framework/C/Rendering/CClientSideBar.cpp

@@ -1 +1,12 @@
 #include "CClientSideBar.h"
+#include <ImGui/ClientSideBar.hpp>
+
+void UImGui_ClientSideBar_Begin()
+{
+    UImGui::ClientSideBar::Begin();
+}
+
+void UImGui_ClientSideBar_End(float deltaTime, UImGui_ClientSideBarFlags flags, UImGui_FVector4 destructiveColor, UImGui_FVector4 destructiveColorActive) noexcept
+{
+    UImGui::ClientSideBar::End(deltaTime, flags, destructiveColor, destructiveColorActive);
+}

Framework/C/Rendering/CClientSideBar.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <C/CDefines.h>
+#include <C/CTypes.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -22,9 +23,9 @@ extern "C"
     // Event Safety - Post-begin
     UIMGUI_PUBLIC_API void UImGui_ClientSideBar_Begin();
 
-    // Renders the bar. In C++, flags defaults to UIMGUI_CLIENT_SIDE_BAR_FLAG_ALL
+    // Renders the bar. In C++, flags defaults to UIMGUI_CLIENT_SIDE_BAR_FLAG_ALL, { 0.753f, 0.110f, 0.157f, 1.0f }, { 0.972f, 0.894f, 0.360f, 1.0f }
     // Event Safety - Post-begin
-    UIMGUI_PUBLIC_API void UImGui_ClientSideBar_End(float deltaTime, UImGui_ClientSideBarFlags flags) noexcept;
+    UIMGUI_PUBLIC_API void UImGui_ClientSideBar_End(float deltaTime, UImGui_ClientSideBarFlags flags, UImGui_FVector4 destructiveColor, UImGui_FVector4 destructiveColorActive) noexcept;
 #ifdef __cplusplus
 }
 #endif

Framework/Modules/Theming/ThirdParty/UntitledImGuiTheme

@@ -15,7 +15,7 @@ void UImGui::ClientSideBar::Begin() noexcept
     ImGui::BeginGroup();
 }
 
-void UImGui::ClientSideBar::End(float deltaTime, UImGui::ClientSideBarFlags flags) noexcept
+void UImGui::ClientSideBar::End(float deltaTime, UImGui::ClientSideBarFlags flags, FVector4 destructiveColor, FVector4 destructiveColorActive) noexcept
 {
     // Create an invisible button that fills up all available space but leaves enough for the buttons
     static float width = 0;
@@ -32,7 +32,7 @@ void UImGui::ClientSideBar::End(float deltaTime, UImGui::ClientSideBarFlags flag
     if (flags & UIMGUI_CLIENT_SIDE_BAR_FLAG_MAXIMISE_BUTTON)
         renderMaximiseButton(width, style);
     if (flags & UIMGUI_CLIENT_SIDE_BAR_FLAG_CLOSE_BUTTON)
-        renderCloseButton(width, style);
+        renderCloseButton(width, style, destructiveColor, destructiveColorActive);
 
     ImGui::PopStyleColor(3);
     ImGui::EndGroup();
@@ -81,10 +81,10 @@ void UImGui::ClientSideBar::renderMaximiseButton(float& width, const ImGuiStyle&
     drawList->AddLine(max, { max.x, min.y }, ImGui::ColorConvertFloat4ToU32(style.Colors[ImGuiCol_Text]));
 }
 
-void UImGui::ClientSideBar::renderCloseButton(float& width, const ImGuiStyle& style) noexcept
+void UImGui::ClientSideBar::renderCloseButton(float& width, const ImGuiStyle& style, FVector4 destructiveColor, FVector4 destructiveColorActive) noexcept
 {
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive, IM_COL32(255, 123, 99, 255));  // TODO: This should be fixed when using UImGuiTheme
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, IM_COL32(192, 28, 40, 255));  // TODO: This should be fixed when using UImGuiTheme
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::ColorConvertFloat4ToU32({ destructiveColor.x, destructiveColor.y, destructiveColor.z, destructiveColor.w }));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::ColorConvertFloat4ToU32({ destructiveColorActive.x, destructiveColorActive.y, destructiveColorActive.z, destructiveColorActive.w }));
 
     if (ImGui::SmallButton(" ##uimgui_internal_invisible_close_button"))
         UImGui::Instance::shutdown();

Framework/Renderer/ImGui/ClientSideBar.cpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <C/Rendering/CClientSideBar.h>
+#include <Types.hpp>
 
 struct ImGuiStyle;
 
@@ -20,10 +21,10 @@ namespace UImGui
 
         // Renders the bar
         // Event Safety - Post-begin
-        static void End(float deltaTime, ClientSideBarFlags flags = UIMGUI_CLIENT_SIDE_BAR_FLAG_ALL) noexcept;
+        static void End(float deltaTime, ClientSideBarFlags flags = UIMGUI_CLIENT_SIDE_BAR_FLAG_ALL, FVector4 destructiveColor = { 0.753f, 0.110f, 0.157f, 1.0f }, FVector4 destructiveColorActive = { 0.972f, 0.894f, 0.360f, 1.0f }) noexcept;
     private:
         static void renderMinimiseButton(float& width, const ImGuiStyle& style) noexcept;
         static void renderMaximiseButton(float& width, const ImGuiStyle& style) noexcept;
-        static void renderCloseButton(float& width, const ImGuiStyle& style) noexcept;
+        static void renderCloseButton(float& width, const ImGuiStyle& style, FVector4 destructiveColor, FVector4 destructiveColorActive) noexcept;
     };
 }