TimMenu/Wi: fixed ropdown a bit

Author: titaniummachine1

TimMenu/Widgets/ColorPicker.lua

@@ -79,7 +79,9 @@ local function ColorPicker(win, label, initColor)
 	local absX, absY = ctx.absX, ctx.absY
 	local baseSpacing = Globals.Style.ItemSpacingY or Globals.Defaults.WINDOW_CONTENT_PADDING
 	local spacingBoost = baseSpacing + padding
-	win._nextLineSpacingBoost = math.max(win._nextLineSpacingBoost or 0, spacingBoost)
+	if win.RequestNextLineSpacing then
+		win:RequestNextLineSpacing(spacingBoost)
+	end
 
 	-- State management
 	local state = Utils.GetState(win, ctx.widgetKey, {

TimMenu/Widgets/Dropdown.lua

@@ -38,10 +38,17 @@ local function DrawDropdownPopupBackground(win, relX, relY, width, listH)
 	Common.DrawFilledRect(absX, absY, absX + width, absY + listH)
 end
 
-local function DrawDropdownPopupItem(win, relX, relY, width, itemH, pad, opt, isHovered)
+local function DrawDropdownPopupItem(win, relX, relY, width, itemH, pad, opt, isHovered, isSelected)
 	local absX, absY = win.X + relX, win.Y + relY
 	draw.SetFont(Globals.Style.Font)
-	Common.SetColor(isHovered and Globals.Colors.ItemHover or Globals.Colors.Item)
+	local bgColor = Globals.Colors.Item
+	if isSelected then
+		bgColor = Globals.Colors.HighlightActive
+	end
+	if isHovered then
+		bgColor = Globals.Colors.ItemHover
+	end
+	Common.SetColor(bgColor)
 	Common.DrawFilledRect(absX, absY, absX + width, absY + itemH)
 	Common.SetColor(Globals.Colors.Text)
 	local _, optH = draw.GetTextSize(opt)
@@ -115,15 +122,19 @@ local function Dropdown(win, label, selectedIndex, options)
 				end
 			end
 			table.insert(TimMenuGlobal.order, win.id)
-		elseif entry.open then
-			if Interaction.IsHovered(win, popupBounds) then
-				local idx = math.floor((input.GetMousePos()[2] - popupBounds.y) / height) + 1
-				if idx >= 1 and idx <= #options then
-					entry.selected = idx
+		else
+			if entry.open then
+				if Interaction.IsHovered(win, popupBounds) then
+					local idx = math.floor((input.GetMousePos()[2] - popupBounds.y) / height) + 1
+					if idx >= 1 and idx <= #options then
+						entry.selected = idx
+						entry.open = false
+						win._widgetBlockedRegions = {}
+					end
+				else
+					entry.open = false
+					win._widgetBlockedRegions = {}
 				end
-			else
-				entry.open = false
-				win._widgetBlockedRegions = {}
 			end
 		end
 	end
@@ -171,7 +182,8 @@ local function Dropdown(win, label, selectedIndex, options)
 				height,
 				pad,
 				opt,
-				isH
+				isH,
+				i == entry.selected
 			)
 		end
 

TimMenu/Window.lua

@@ -59,6 +59,7 @@ function Window.new(params)
 	self.lineHeight = 0
 	-- Initialize per-widget blocking regions for popup widgets
 	self._widgetBlockedRegions = {}
+	self._requestedNextLineSpacing = nil
 	return self
 end
 
@@ -180,9 +181,9 @@ end
 function Window:NextLine(spacing)
 	local baseSpacing = Globals.Style.ItemSpacingY or Globals.Defaults.WINDOW_CONTENT_PADDING
 	spacing = spacing or baseSpacing
-	if self._nextLineSpacingBoost then
-		spacing = math.max(spacing, self._nextLineSpacingBoost)
-		self._nextLineSpacingBoost = nil
+	if self._requestedNextLineSpacing then
+		spacing = math.max(spacing, self._requestedNextLineSpacing)
+		self._requestedNextLineSpacing = nil
 	end
 	self.cursorY = self.cursorY + self.lineHeight + spacing
 	self.cursorX = Globals.Defaults.WINDOW_CONTENT_PADDING -- reset to left padding
@@ -215,12 +216,26 @@ function Window:Spacing(verticalSpacing)
 	-- Important: Do NOT reset cursorX here.
 end
 
+--- Allows a widget to request a minimum spacing before the next line starts.
+function Window:RequestNextLineSpacing(minSpacing)
+	if type(minSpacing) ~= "number" then
+		return
+	end
+	if minSpacing <= 0 then
+		return
+	end
+	if not self._requestedNextLineSpacing or minSpacing > self._requestedNextLineSpacing then
+		self._requestedNextLineSpacing = minSpacing
+	end
+end
+
 --- Reset the layout cursor for widgets (called on Begin)
 function Window:resetCursor()
 	local padding = Globals.Defaults.WINDOW_CONTENT_PADDING
 	self.cursorX = padding
 	self.cursorY = Globals.Defaults.TITLE_BAR_HEIGHT + padding
 	self.lineHeight = 0
+	self._requestedNextLineSpacing = nil
 	-- Clear any widget blocking regions at start of frame
 	self._widgetBlockedRegions = {}
 	-- Clear header tabs flag so titles center if no header tabs