Fix themes

Signed-off-by: RyanLua <[email protected]>

Author: ryanlua

src/Signs/StudioWidgets/CollapsibleTitledSection.lua

@@ -133,7 +133,7 @@ function CollapsibleTitledSectionClass:_ToggleCollapsedState()
 end
 
 -- Creates the title bar of the section
-function CollapsibleTitledSectionClass:_CreateTitleBar(titleText)
+function CollapsibleTitledSectionClass:_CreateTitleBar(titleText: string)
 	local titleTextOffset = self._titleBarHeight
 
 	local titleBar = Instance.new("ImageButton")
@@ -171,12 +171,6 @@ function CollapsibleTitledSectionClass:_CreateTitleBar(titleText)
 
 	self._titleBar = titleBar
 
-	local function _UpdateMinimizeButtonTheme()
-		self._minimizeButton.ImageColor3 = settings().Studio.Theme:GetColor(Enum.StudioStyleGuideColor.MainText)
-	end
-	settings().Studio.ThemeChanged:Connect(_UpdateMinimizeButtonTheme)
-	_UpdateMinimizeButtonTheme()
-
 	titleBar.InputBegan:Connect(function()
 		self._hovered = true
 		self:_updateButtonVisual()

src/Signs/StudioWidgets/LabeledButton.lua

@@ -14,17 +14,6 @@ local kMinLabelWidth = GuiUtilities.kCheckboxMinLabelWidth
 local kMinMargin = GuiUtilities.kCheckboxMinMargin
 local kMinButtonWidth = kCheckboxWidth
 
-local kButtonDefaultBackgroundColor = settings().Studio.Theme:GetColor(
-	Enum.StudioStyleGuideColor.FilterButtonDefault,
-	Enum.StudioStyleGuideModifier.Default
-)
-local kButtonHoverBackgroundColor =
-	settings().Studio.Theme:GetColor(Enum.StudioStyleGuideColor.FilterButtonHover, Enum.StudioStyleGuideModifier.Hover)
-local kButtonPressedBackgroundColor = settings().Studio.Theme:GetColor(
-	Enum.StudioStyleGuideColor.FilterButtonChecked,
-	Enum.StudioStyleGuideModifier.Pressed
-)
-
 local LabeledButtonClass = {}
 LabeledButtonClass.__index = LabeledButtonClass
 
@@ -127,6 +116,19 @@ end
 
 -- Internal function to update button visual state.
 function LabeledButtonClass:_updateCheckboxVisual()
+	local kButtonDefaultBackgroundColor = settings().Studio.Theme:GetColor(
+		Enum.StudioStyleGuideColor.FilterButtonDefault,
+		Enum.StudioStyleGuideModifier.Default
+	)
+	local kButtonHoverBackgroundColor = settings().Studio.Theme:GetColor(
+		Enum.StudioStyleGuideColor.FilterButtonHover,
+		Enum.StudioStyleGuideModifier.Hover
+	)
+	local kButtonPressedBackgroundColor = settings().Studio.Theme:GetColor(
+		Enum.StudioStyleGuideColor.FilterButtonChecked,
+		Enum.StudioStyleGuideModifier.Pressed
+	)
+
 	if self._value then
 		self._button.BackgroundColor3 = kButtonPressedBackgroundColor
 	elseif self._hovered then
@@ -138,6 +140,15 @@ end
 
 -- Internal function to update button visual state.
 function LabeledButtonClass:_HandleUpdatedValue()
+	local kButtonDefaultBackgroundColor = settings().Studio.Theme:GetColor(
+		Enum.StudioStyleGuideColor.FilterButtonDefault,
+		Enum.StudioStyleGuideModifier.Default
+	)
+	local kButtonPressedBackgroundColor = settings().Studio.Theme:GetColor(
+		Enum.StudioStyleGuideColor.FilterButtonChecked,
+		Enum.StudioStyleGuideModifier.Pressed
+	)
+
 	if self:GetValue() then
 		self._button.BackgroundColor3 = kButtonPressedBackgroundColor
 	else