TimMenu/Wi: fixed offset of color picker

Author: titaniummachine1

TimMenu/Widgets/ColorPicker.lua

@@ -69,16 +69,17 @@ local function ColorPicker(win, label, initColor)
 	draw.SetFont(Globals.Style.Font)
 	local txtW, txtH = draw.GetTextSize(label)
 	local padding = Globals.Style.ItemPadding
-	local extraVerticalInset = math.ceil((Globals.Style.ItemSpacingY or padding) * 0.5)
-	local verticalInset = padding + extraVerticalInset
 	local colorSize = math.max(Globals.Style.ItemSize, txtH)
-	local height = colorSize + (verticalInset * 2)
+	local height = colorSize + (padding * 2)
 	local previewBlockW = colorSize + (padding * 2)
 	local arrowBoxW = height
 	local width = previewBlockW + padding + txtW + padding + arrowBoxW
 
 	local ctx = WidgetBase.Setup(win, "ColorPicker", label, width, height)
 	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)
 
 	-- State management
 	local state = Utils.GetState(win, ctx.widgetKey, {
@@ -185,7 +186,7 @@ local function ColorPicker(win, label, initColor)
 	end
 	local mainW = width - arrowBoxW
 	local arrowX = px + mainW
-	local colorY = py + verticalInset
+	local colorY = py + padding
 	local colorX = px + padding
 	local colorX2 = colorX + colorSize
 	Common.QueueRect(win, Globals.Layers.WidgetBackground, px, py, px + mainW, py + height, bg, nil)

TimMenu/Window.lua

@@ -180,6 +180,10 @@ 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
+	end
 	self.cursorY = self.cursorY + self.lineHeight + spacing
 	self.cursorX = Globals.Defaults.WINDOW_CONTENT_PADDING -- reset to left padding
 	local endOfLineY = self.cursorY -- Y position *before* resetting lineHeight