Removed ImGui brute-force style changes for Push/Pop (#738)

Author: adriengivry

Sources/OvCore/src/OvCore/Helpers/GUIDrawer.cpp

@@ -22,7 +22,6 @@
 #include <OvUI/Widgets/Layout/Columns.h>
 #include <OvUI/Widgets/Selection/CheckBox.h>
 #include <OvUI/Widgets/Buttons/Button.h>
-#include <OvUI/Widgets/Buttons/ButtonSmall.h>
 #include <OvUI/Widgets/Buttons/Toggle.h>
 #include <OvUI/Plugins/DDTarget.h>
 

Sources/OvUI/include/OvUI/Widgets/Buttons/Button.h

@@ -6,12 +6,13 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 
 #include <OvMaths/FVector2.h>
 
-#include "OvUI/Widgets/Buttons/AButton.h"
-#include "OvUI/Types/Color.h"
+#include <OvUI/Widgets/Buttons/AButton.h>
+#include <OvUI/Types/Color.h>
 
 namespace OvUI::Widgets::Buttons
 {
@@ -37,10 +38,9 @@ namespace OvUI::Widgets::Buttons
 		OvMaths::FVector2 size;
 		bool disabled = false;
 
-		Types::Color idleBackgroundColor;
-		Types::Color hoveredBackgroundColor;
-		Types::Color clickedBackgroundColor;
-
-		Types::Color textColor;
+		std::optional<Types::Color> idleBackgroundColor;
+		std::optional<Types::Color> hoveredBackgroundColor;
+		std::optional<Types::Color> clickedBackgroundColor;
+		std::optional<Types::Color> textColor;
 	};
-}
+}

Sources/OvUI/include/OvUI/Widgets/Buttons/ButtonSmall.h

@@ -10,16 +10,12 @@
 
 void OvUI::Panels::PanelUndecorated::_Draw_Impl()
 {
-	auto& style = ImGui::GetStyle();
-	ImVec2 previousPadding = style.WindowPadding;
-	ImVec2 previousMinSize = style.WindowMinSize;
-	style.WindowPadding = { 0, 0 };
-	style.WindowMinSize = { 0, 0 };
+	ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, { 0, 0 });
+	ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, { 0, 0 });
 
 	if (ImGui::Begin(m_panelID.c_str(), nullptr, CollectFlags()))
 	{
-		style.WindowPadding = previousPadding;
-		style.WindowMinSize = previousMinSize;
+		ImGui::PopStyleVar(2);
 
 		Update();
 
@@ -29,7 +25,7 @@ void OvUI::Panels::PanelUndecorated::_Draw_Impl()
 	}
 	else
 	{
-		style.WindowPadding = previousPadding;
+		ImGui::PopStyleVar(2);
 	}
 }
 

Sources/OvUI/src/OvUI/Panels/PanelUndecorated.cpp

@@ -13,27 +13,37 @@
 OvUI::Widgets::Buttons::Button::Button(const std::string& p_label, const OvMaths::FVector2& p_size, bool p_disabled) :
 	label(p_label), size(p_size), disabled(p_disabled)
 {
-	auto& style = ImGui::GetStyle();
-
-	idleBackgroundColor		= Internal::Converter::ToColor(style.Colors[ImGuiCol_Button]);
-	hoveredBackgroundColor	= Internal::Converter::ToColor(style.Colors[ImGuiCol_ButtonHovered]);
-	clickedBackgroundColor	= Internal::Converter::ToColor(style.Colors[ImGuiCol_ButtonActive]);
-	textColor				= Internal::Converter::ToColor(style.Colors[ImGuiCol_Text]);
 }
 
 void OvUI::Widgets::Buttons::Button::_Draw_Impl()
 {
-	auto& style = ImGui::GetStyle();
+	using namespace OvUI::Internal;
 
-	auto defaultIdleColor		= style.Colors[ImGuiCol_Button];
-	auto defaultHoveredColor	= style.Colors[ImGuiCol_ButtonHovered];
-	auto defaultClickedColor	= style.Colors[ImGuiCol_ButtonActive];
-	auto defaultTextColor		= style.Colors[ImGuiCol_Text];
+	uint32_t styleOverrides = 0;
 
-	style.Colors[ImGuiCol_Button]			= OvUI::Internal::Converter::ToImVec4(idleBackgroundColor);
-	style.Colors[ImGuiCol_ButtonHovered]	= OvUI::Internal::Converter::ToImVec4(hoveredBackgroundColor);
-	style.Colors[ImGuiCol_ButtonActive]		= OvUI::Internal::Converter::ToImVec4(clickedBackgroundColor);
-	style.Colors[ImGuiCol_Text]				= OvUI::Internal::Converter::ToImVec4(textColor);
+	if (idleBackgroundColor.has_value())
+	{
+		ImGui::PushStyleColor(ImGuiCol_Button, Converter::ToImVec4(idleBackgroundColor.value()));
+		++styleOverrides;
+	}
+
+	if (hoveredBackgroundColor.has_value())
+	{
+		ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Converter::ToImVec4(hoveredBackgroundColor.value()));
+		++styleOverrides;
+	}
+
+	if (clickedBackgroundColor.has_value())
+	{
+		ImGui::PushStyleColor(ImGuiCol_ButtonActive, Converter::ToImVec4(clickedBackgroundColor.value()));
+		++styleOverrides;
+	}
+
+	if (textColor.has_value())
+	{
+		ImGui::PushStyleColor(ImGuiCol_Text, Converter::ToImVec4(textColor.value()));
+		++styleOverrides;
+	}
 
 	// Instead of using disabled directly, as its value can change if some
 	// callback is bound to the ClickedEvent.
@@ -54,8 +64,6 @@ void OvUI::Widgets::Buttons::Button::_Draw_Impl()
 		ImGui::EndDisabled();
 	}
 
-	style.Colors[ImGuiCol_Button]			= defaultIdleColor;
-	style.Colors[ImGuiCol_ButtonHovered]	= defaultHoveredColor;
-	style.Colors[ImGuiCol_ButtonActive]		= defaultClickedColor;
-	style.Colors[ImGuiCol_Text]				= defaultTextColor;
+	ImGui::PopStyleColor(styleOverrides);
 }
+