checkpoint: layout adjustments and project restructuring (broken)

Author: Antigravity

.luarc.json

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
+    "Lua.runtime.version": "Lua 5.4",
+    "Lua.diagnostics.globals": [
+        "ImMenu",
+        "loadlib",
+        "warn"
+    ],
+    "Lua.runtime.pathStrict": false,
+    "Lua.workspace.library": [
+        ".vscode/Lmaobox-Annotations/library"
+    ],
+    "Lua.workspace.ignoreDir": [
+        "node_modules",
+        ".vscode"
+    ],
+    "Lua.workspace.checkThirdParty": false,
+    "Lua.telemetry.enable": false
+}

.vscode/.luarc.json

@@ -0,0 +1 @@
+Subproject commit 1c72c06cf81fdff3c3518bdca3e1099fe7db5785

.vscode/Lmaobox-Annotations

@@ -48,12 +48,14 @@ function Interaction.IsHovered(win, bounds)
 	if win._widgetBlockedRegions then
 		local elementInBlockedRegion = false
 		for _, region in ipairs(win._widgetBlockedRegions) do
-			if
-				bounds.x >= region.x
-				and bounds.x + bounds.w <= region.x + region.w
-				and bounds.y >= region.y
-				and bounds.y + bounds.h <= region.y + region.h
-			then
+			local withinXStart = bounds.x >= region.x
+			local withinXEnd = bounds.x + bounds.w <= region.x + region.w
+			local withinYStart = bounds.y >= region.y
+			local withinYEnd = bounds.y + bounds.h <= region.y + region.h
+
+			local isFullyInside = withinXStart and withinXEnd and withinYStart and withinYEnd
+
+			if isFullyInside then
 				elementInBlockedRegion = true
 				break
 			end

TimMenu/Interaction.lua

@@ -122,13 +122,17 @@ local function _enqueueBorderDraw(win, layoutState, depth, size)
 	end)
 end
 
-local function _finalizeCursorAndLayout(win, layoutState, width, rowHeight)
+local function _finalizeCursorAndLayout(win, layoutState, width, rowHeight, sameLine)
 	-- Treat sector as a single widget occupying the computed width/height
 	local horizontalSpacing = getHorizontalGap()
 	win.cursorX = layoutState.startX + width + horizontalSpacing
 	win.cursorY = layoutState.startY
 	local verticalGap = getVerticalGap()
-	win.lineHeight = math.max(layoutState.preLineHeight or 0, rowHeight + verticalGap)
+	win.lineHeight = math.max(layoutState.preLineHeight or 0, rowHeight)
+
+	if not sameLine then
+		win:NextLine(verticalGap)
+	end
 
 	if #win._sectorStack > 0 then
 		local parentSector = win._sectorStack[#win._sectorStack]
@@ -236,7 +240,7 @@ function Sector.Begin(win, label)
 	end
 end
 
-function Sector.End(win)
+function Sector.End(win, sameLine)
 	if not win._sectorStack or #win._sectorStack == 0 then
 		return
 	end
@@ -263,7 +267,7 @@ function Sector.End(win)
 	win.QueueDrawAtLayer = layoutState.origQueue
 
 	-- Use calculated currentWidth/Height for layout/cursor updates, but persistent for drawing.
-	_finalizeCursorAndLayout(win, layoutState, persistentSize.width, rowHeight)
+	_finalizeCursorAndLayout(win, layoutState, persistentSize.width, rowHeight, sameLine)
 end
 
 return Sector

TimMenu/Layout/Sector.lua

@@ -263,12 +263,12 @@ function TimMenu.BeginSector(label)
 	end, label)
 end
 
-function TimMenu.EndSector()
+function TimMenu.EndSector(sameLine)
 	local win = TimMenu.GetCurrentWindow()
 	if not win or not win._sectorStack or #win._sectorStack == 0 then
 		return
 	end
-	SectorWidget.End(win)
+	SectorWidget.End(win, sameLine)
 end
 
 local reRegistered = false

TimMenu/Main.lua

@@ -1,6 +1,7 @@
 local Globals = require("TimMenu.Globals")
 local Common = require("TimMenu.Common")
 local Popup = require("TimMenu.Layout.Popup")
+local Utils = require("TimMenu.Utils")
 
 local Tooltip = {}
 
@@ -124,7 +125,6 @@ function Tooltip.ProcessWindowTooltips(win)
 	end
 
 	local mouseX, mouseY = table.unpack(input.GetMousePos())
-	local Utils = require("TimMenu.Utils")
 
 	for index = #boundsList, 1, -1 do
 		local bounds = boundsList[index]

TimMenu/Widgets/Tooltip.lua

@@ -78,7 +78,7 @@ end
 function Window:_HitTest(x, y)
 	-- Check main window bounds (title bar + content area)
 	local titleHeight = Globals.Defaults.TITLE_BAR_HEIGHT
-	local mainBounds = x >= self.X and x <= self.X + self.W and y >= self.Y and y <= self.Y + titleHeight + self.H
+	local mainBounds = x >= self.X and x <= self.X + self.W and y >= self.Y and y <= self.Y + self.H
 
 	-- If main bounds pass, return true
 	if mainBounds then
@@ -129,7 +129,7 @@ function Window:_Draw()
 	-- Background
 	Common.SetColor(Globals.Colors.Window)
 	-- Background covers title + content area (no extra padding)
-	Common.DrawFilledRect(self.X, self.Y + titleHeight, self.X + self.W, self.Y + titleHeight + self.H)
+	Common.DrawFilledRect(self.X, self.Y + titleHeight, self.X + self.W, self.Y + self.H)
 
 	-- Title bar
 	Common.SetColor(Globals.Colors.Title)
@@ -139,7 +139,7 @@ function Window:_Draw()
 	if Globals.Style.EnableWindowBorder then
 		Common.SetColor(Globals.Colors.WindowBorder)
 		-- Outline around full window including title and content area
-		Common.DrawOutlinedRect(self.X, self.Y, self.X + self.W, self.Y + titleHeight + self.H)
+		Common.DrawOutlinedRect(self.X, self.Y, self.X + self.W, self.Y + self.H)
 	end
 
 	-- Title text
@@ -172,7 +172,7 @@ function Window:AddWidget(width, height)
 	-- Update window dimensions if needed
 	self.W = math.max(self.W, x + width + padding)
 	self.lineHeight = math.max(self.lineHeight, height)
-	self.H = math.max(self.H, y + self.lineHeight)
+	self.H = math.max(self.H, y + self.lineHeight + padding)
 
 	-- Update cursor position for the *next* widget on this line
 	local horizontalSpacing = Globals.Style.ItemSpacingX or Globals.Defaults.ITEM_SPACING