TimMenu: idk anymore

Author: titaniummachine1

TimMenu/Globals.lua

@@ -129,11 +129,6 @@ Globals.LayersPerGroup = 10
 -- Popup layer that's always on top (above all sectors)
 Globals.POPUP_LAYER_BASE = 1000
 
--- Global click consumption flag to prevent race conditions
--- When true, indicates a widget has already handled the click
--- Window manager should respect this and not change focus
-Globals.isClickConsumed = false
-
 -- Preload interactive widget images
 local ImgDecoder = require("TimMenu.images.imageDecoder")
 Globals.Images = Globals.Images or {}

TimMenu/Main.lua

@@ -278,7 +278,6 @@ local function _TimMenu_GlobalDraw()
 
 	local mouseX, mouseY = table.unpack(input.GetMousePos())
 	TimMenuGlobal.mouseX, TimMenuGlobal.mouseY = mouseX, mouseY
-	local focusedWindowKey = nil
 
 	local currentFrame = globals.FrameCount()
 	local keysToRemove = {}
@@ -297,20 +296,39 @@ local function _TimMenu_GlobalDraw()
 		end
 	end
 
+	-- PRIMARY FOCUS LOOP: Top-to-bottom search for window under mouse
+	local windowUnderMouse = nil
+	local mousePressed = input.IsButtonPressed(MOUSE_LEFT)
+
 	for i = #TimMenuGlobal.order, 1, -1 do
 		local key = TimMenuGlobal.order[i]
 		local win = TimMenuGlobal.windows[key]
 		if win and win.visible and win:_HitTest(mouseX, mouseY) then
-			focusedWindowKey = key
-			break
+			windowUnderMouse = key
+			break -- FOUND THE TOPMOST OWNER. STOP SEARCHING.
+		end
+	end
+
+	-- Handle focus changes only when clicking
+	if mousePressed and windowUnderMouse then
+		-- Bring the owner window to front
+		if TimMenuGlobal.order[#TimMenuGlobal.order] ~= windowUnderMouse then
+			for j, v_key in ipairs(TimMenuGlobal.order) do
+				if v_key == windowUnderMouse then
+					table.remove(TimMenuGlobal.order, j)
+					break
+				end
+			end
+			table.insert(TimMenuGlobal.order, windowUnderMouse)
 		end
 	end
 
+	-- Update logic for all visible windows
 	for i = 1, #TimMenuGlobal.order do
 		local key = TimMenuGlobal.order[i]
 		local win = TimMenuGlobal.windows[key]
 		if win and win.visible then
-			local isFocused = (key == focusedWindowKey)
+			local isFocused = (key == windowUnderMouse)
 			win:_UpdateLogic(
 				mouseX,
 				mouseY,
@@ -319,25 +337,6 @@ local function _TimMenu_GlobalDraw()
 				input.IsButtonDown(MOUSE_LEFT),
 				input.IsButtonReleased(MOUSE_LEFT)
 			)
-
-			-- Only change focus if window allows it (prevents popup focus stealing)
-			-- AND no widget has consumed the click
-			if
-				isFocused
-				and input.IsButtonPressed(MOUSE_LEFT)
-				and win:ShouldChangeFocus(mouseX, mouseY)
-				and not Globals.isClickConsumed
-			then
-				if TimMenuGlobal.order[#TimMenuGlobal.order] ~= key then
-					for j, v_key in ipairs(TimMenuGlobal.order) do
-						if v_key == key then
-							table.remove(TimMenuGlobal.order, j)
-							break
-						end
-					end
-					table.insert(TimMenuGlobal.order, key)
-				end
-			end
 		end
 	end
 
@@ -358,9 +357,6 @@ local function _TimMenu_GlobalDraw()
 		end
 	end
 
-	-- Reset click consumption flag at end of frame
-	Globals.isClickConsumed = false
-
 	if not reRegistered then
 		callbacks.Unregister("Draw", "zTimMenu_GlobalDraw")
 		callbacks.Register("Draw", "zTimMenu_GlobalDraw", _TimMenu_GlobalDraw)

TimMenu/WidgetBase.lua

@@ -111,10 +111,4 @@ function WidgetBase.MeasureText(text)
 	return draw.GetTextSize(text)
 end
 
---- Mark the current click as consumed by a widget
---- This prevents the window manager from changing focus
-function WidgetBase.ConsumeClick()
-	Globals.isClickConsumed = true
-end
-
 return WidgetBase

TimMenu/Widgets/Combo.lua

@@ -164,8 +164,6 @@ local function Combo(win, label, selected, options)
 				local idx = math.floor((input.GetMousePos()[2] - popupBounds.y) / height) + 1
 				if idx >= 1 and idx <= #options then
 					entry.selected[idx] = not entry.selected[idx]
-					-- Consume the click to prevent window focus changes
-					WidgetBase.ConsumeClick()
 				end
 			else
 				entry.open = false

TimMenu/Widgets/Dropdown.lua

@@ -155,8 +155,6 @@ local function Dropdown(win, label, selectedIndex, options)
 						entry.selected = idx
 						entry.open = false
 						win._widgetBlockedRegions = {}
-						-- Consume the click to prevent window focus changes
-						WidgetBase.ConsumeClick()
 					end
 				else
 					entry.open = false

TimMenu/Window.lua

@@ -76,16 +76,16 @@ end
 
 --- Hit test: is a point inside this window (including title bar, content area, and popups)?
 function Window:_HitTest(x, y)
-	-- Basic window bounds (title and content)
+	-- Check main window bounds (title bar + content area)
 	local titleHeight = Globals.Defaults.TITLE_BAR_HEIGHT
-	local basicBounds = 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 + titleHeight + self.H
 
-	-- If basic bounds pass, return true
-	if basicBounds then
+	-- If main bounds pass, return true
+	if mainBounds then
 		return true
 	end
 
-	-- Check if point is in any widget blocked regions (popups)
+	-- Check if point is in any popup regions (extended volume)
 	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