TimMenu:

Author: titaniummachine1

TimMenu/Main.lua

@@ -300,20 +300,9 @@ local function _TimMenu_GlobalDraw()
 	for i = #TimMenuGlobal.order, 1, -1 do
 		local key = TimMenuGlobal.order[i]
 		local win = TimMenuGlobal.windows[key]
-		if win and win.visible then
-			-- Check if window has any click shapes at this point (popup-aware)
-			local shapeId, shapeData = win:GetClickShapeAt(mouseX, mouseY)
-			if shapeId then
-				-- Found a click shape - check if it should change focus
-				if win:ShouldChangeFocus(mouseX, mouseY) then
-					focusedWindowKey = key
-					break
-				end
-			elseif win:_HitTest(mouseX, mouseY) then
-				-- Fallback to traditional hit testing for non-shape areas
-				focusedWindowKey = key
-				break
-			end
+		if win and win.visible and win:_HitTest(mouseX, mouseY) then
+			focusedWindowKey = key
+			break
 		end
 	end
 
@@ -331,7 +320,8 @@ local function _TimMenu_GlobalDraw()
 				input.IsButtonReleased(MOUSE_LEFT)
 			)
 
-			if isFocused and input.IsButtonPressed(MOUSE_LEFT) then
+			-- Only change focus if window allows it (prevents popup focus stealing)
+			if isFocused and input.IsButtonPressed(MOUSE_LEFT) and win:ShouldChangeFocus(mouseX, mouseY) then
 				if TimMenuGlobal.order[#TimMenuGlobal.order] ~= key then
 					for j, v_key in ipairs(TimMenuGlobal.order) do
 						if v_key == key then

TimMenu/Widgets/ColorPicker.lua

@@ -117,14 +117,6 @@ local function ColorPicker(win, label, initColor)
 	-- Maintain popup blocked regions while open
 	if state.open then
 		win._widgetBlockedRegions = { popupBounds }
-		-- Register popup click shape with focus weight 0 (no focus change)
-		win:AddClickShape(ctx.widgetKey .. "_popup", {
-			type = "rectangle",
-			x = popupBounds.x,
-			y = popupBounds.y,
-			w = popupBounds.w,
-			h = popupBounds.h,
-		}, 0, { type = "popup", widgetKey = ctx.widgetKey })
 	end
 
 	-- Toggle popup on field click
@@ -183,7 +175,6 @@ local function ColorPicker(win, label, initColor)
 		if not inField and not inPopup then
 			state.open = false
 			win._widgetBlockedRegions = {}
-			win:RemoveClickShape(ctx.widgetKey .. "_popup")
 		end
 	end
 

TimMenu/Widgets/Combo.lua

@@ -135,14 +135,6 @@ local function Combo(win, label, selected, options)
 	-- Maintain popup blocked regions while open
 	if entry.open then
 		win._widgetBlockedRegions = { popupBounds }
-		-- Register popup click shape with focus weight 0 (no focus change)
-		win:AddClickShape(ctx.widgetKey .. "_popup", {
-			type = "rectangle",
-			x = popupBounds.x,
-			y = popupBounds.y,
-			w = popupBounds.w,
-			h = popupBounds.h,
-		}, 0, { type = "popup", widgetKey = ctx.widgetKey })
 	end
 
 	-- Close popup on outside click using cached mouse position
@@ -176,7 +168,6 @@ local function Combo(win, label, selected, options)
 			else
 				entry.open = false
 				win._widgetBlockedRegions = {}
-				win:RemoveClickShape(ctx.widgetKey .. "_popup")
 			end
 		end
 	end

TimMenu/Widgets/Dropdown.lua

@@ -123,14 +123,6 @@ local function Dropdown(win, label, selectedIndex, options)
 	-- Maintain popup blocked regions while open
 	if entry.open then
 		win._widgetBlockedRegions = { popupBounds }
-		-- Register popup click shape with focus weight 0 (no focus change)
-		win:AddClickShape(ctx.widgetKey .. "_popup", {
-			type = "rectangle",
-			x = popupBounds.x,
-			y = popupBounds.y,
-			w = popupBounds.w,
-			h = popupBounds.h,
-		}, 0, { type = "popup", widgetKey = ctx.widgetKey })
 	end
 
 	-- Close popup on outside click using cached mouse position
@@ -163,12 +155,10 @@ local function Dropdown(win, label, selectedIndex, options)
 						entry.selected = idx
 						entry.open = false
 						win._widgetBlockedRegions = {}
-						win:RemoveClickShape(ctx.widgetKey .. "_popup")
 					end
 				else
 					entry.open = false
 					win._widgetBlockedRegions = {}
-					win:RemoveClickShape(ctx.widgetKey .. "_popup")
 				end
 			end
 		end

TimMenu/Window.lua

@@ -62,6 +62,8 @@ function Window.new(params)
 	self._widgetBlockedRegions = {}
 	-- Initialize click shapes for precise hit testing
 	self._clickShapes = {}
+	-- Flag to prevent focus changes during popup interactions
+	self._preventFocusChange = false
 	self._requestedNextLineSpacing = nil
 	return self
 end
@@ -219,8 +221,21 @@ end
 ---@param y number Y coordinate
 ---@return boolean
 function Window:ShouldChangeFocus(x, y)
-	local _, shapeData = self:GetClickShapeAt(x, y)
-	return shapeData and shapeData.focusWeight > 0
+	-- If flag is set, prevent focus changes (used during popup interactions)
+	if self._preventFocusChange then
+		return false
+	end
+
+	-- Check if point is in any popup region
+	if self._widgetBlockedRegions then
+		for _, region in ipairs(self._widgetBlockedRegions) do
+			if x >= region.x and x <= region.x + region.w and y >= region.y and y <= region.y + region.h then
+				return false -- Don't change focus if clicking popup area
+			end
+		end
+	end
+
+	return true -- Allow focus change for regular window areas
 end
 
 --- Get the focus weight of a click shape at a point
@@ -303,27 +318,6 @@ function Window:resetCursor()
 	self.H = Globals.Defaults.DEFAULT_H
 	-- Clear sector sizes to allow sectors to shrink each frame
 	self._sectorSizes = {}
-
-	-- Register main window click shapes
-	local titleHeight = Globals.Defaults.TITLE_BAR_HEIGHT
-
-	-- Title bar - high focus weight for dragging
-	self:AddClickShape("title_bar", {
-		type = "rectangle",
-		x = self.X,
-		y = self.Y,
-		w = self.W,
-		h = titleHeight,
-	}, 2, { type = "title_bar" })
-
-	-- Content area - normal focus weight
-	self:AddClickShape("content_area", {
-		type = "rectangle",
-		x = self.X,
-		y = self.Y + titleHeight,
-		w = self.W,
-		h = self.H,
-	}, 1, { type = "content_area" })
 end
 
 return Window