chore(dynamic-island): normalize island width helpers

Author: khaneliman

modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/init.lua

@@ -204,6 +204,8 @@ local monitorResolution = monitorHelpers.resolveMonitorResolution({
 	logWarn = logWarn,
 })
 local calculateMargin = monitorHelpers.calculateMargin(monitorResolution)
+local calculateIslandWidth = monitorHelpers.calculateIslandWidth(monitorResolution)
+local calculateVisibleMargin = monitorHelpers.calculateVisibleMargin(monitorResolution)
 local barColor = get("colors.black", "0xff000000")
 local display = get("main.display", "main")
 local fontFamily = get("main.font", "SF Pro")
@@ -449,6 +451,8 @@ local baseCtx = {
 	colorTransparent = colorTransparent,
 	monitorResolution = monitorResolution,
 	calculateMargin = calculateMargin,
+	calculateVisibleMargin = calculateVisibleMargin,
+	calculateIslandWidth = calculateIslandWidth,
 	squishAmount = squishAmount,
 	defaultHeight = defaultHeight,
 	defaultWidth = defaultWidth,

modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/lua/helpers/monitor.lua

@@ -212,7 +212,51 @@ local function makeMarginCalculator(monitorResolution)
 	end
 end
 
+local function makeIslandWidthCalculator(monitorResolution)
+	local safeResolution = tonumber(monitorResolution) or 0
+	if safeResolution < 0 then
+		safeResolution = 0
+	end
+
+	if safeResolution <= 0 then
+		return function(width)
+			return 0
+		end
+	end
+
+	local maxHalf = math.floor(safeResolution / 2)
+
+	return function(width)
+		if maxHalf <= 0 then
+			return 0
+		end
+
+		local halfWidth = asPositiveInteger(width)
+		if halfWidth == nil then
+			return 0
+		end
+
+		halfWidth = clamp(halfWidth, 1, maxHalf)
+		return halfWidth * 2
+	end
+end
+
+local function makeVisibleMarginCalculator(monitorResolution)
+	local halfMarginCalculator = makeMarginCalculator(monitorResolution)
+
+	return function(visibleWidth)
+		local width = tonumber(visibleWidth) or 0
+		if width <= 0 then
+			return 0
+		end
+
+		return halfMarginCalculator(math.floor(width / 2))
+	end
+end
+
 return {
 	calculateMargin = makeMarginCalculator,
+	calculateIslandWidth = makeIslandWidthCalculator,
+	calculateVisibleMargin = makeVisibleMarginCalculator,
 	resolveMonitorResolution = resolveMonitorResolution,
 }

modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/lua/islands/helpers/meter.lua

@@ -24,6 +24,7 @@ return function(ctx, options)
 	local getIcon = options.getIcon
 
 	local maxExpandWidth = ctx.asNumber(ctx.get("islands." .. name .. ".maxExpandWidth", "130"), 130)
+	local maxExpandWidthPx = ctx.calculateIslandWidth(maxExpandWidth)
 	local expandHeight = ctx.asNumber(ctx.get("islands." .. name .. ".expandHeight", "65"), 65)
 	local cornerRadius = ctx.asNumber(ctx.get("islands." .. name .. ".cornerRadius", "12"), 12)
 	local expandMargin = ctx.calculateMargin(maxExpandWidth)
@@ -151,7 +152,7 @@ return function(ctx, options)
 			})
 		end)
 
-		local barWidth = math.floor((percent / 100) * (maxExpandWidth * 2 - 20) + 0.5)
+		local barWidth = math.floor((percent / 100) * (maxExpandWidthPx - 20) + 0.5)
 		ctx.Sbar.animate("tanh", 15, function()
 			barItem:set({
 				width = barWidth,

modules/home/programs/graphical/bars/sketchybar/dynamic-island-sketchybar/lua/islands/music.lua

@@ -9,13 +9,14 @@ return function(ctx)
 	local resultSeparator = "|||"
 
 	local maxExpandWidth = ctx.asNumber(ctx.get("islands.music.info.maxExpandWidth", "190"), 190)
+	local maxExpandWidthPx = ctx.calculateIslandWidth(maxExpandWidth)
 	local expandHeight = ctx.asNumber(ctx.get("islands.music.info.expandHeight", "100"), 100)
 	local cornerRad = ctx.asNumber(ctx.get("islands.music.info.cornerRadius", "19"), 19)
 	local expandMargin = ctx.calculateMargin(maxExpandWidth)
 	local imageScale = 0.15
 	local imageYOffset = -10
 	local artSlotWidth = 118
-	local textWidth = math.max(120, maxExpandWidth * 2 - artSlotWidth - 28)
+	local textWidth = math.max(120, maxExpandWidthPx - artSlotWidth - 28)
 	local contentYOffset = -12
 	local maxArtworkRetryAttempts = 4
 	local artworkRetryDelaySeconds = 0.6