link map and homeworld, colony when focus

Author: cloudwu

core/widget.lua

@@ -79,23 +79,33 @@ function widget.draw_list(dom, texts, font_id, sprites)
 end
 
 function widget.draw(batch, list, focus)
-	local focus_region_func
-	local focus_region_object
+	local delay
 	for _, obj in ipairs(list) do
 		local o, x, y = table.unpack(obj)
 		if type(o) == "function" then
-			if x.region ~= focus then
-				o(x)
+			if focus and focus[x.region] then
+				local f = o
+				local arg = x
+				local last = delay
+				if delay then
+					delay = function()
+						last()
+						f(arg)
+					end
+				else
+					delay = function()
+						f(arg)
+					end
+				end
 			else
-				focus_region_func = o
-				focus_region_object = x
+				o(x)
 			end
 		else
 			batch:add(o, x, y)
 		end
 	end
-	if focus_region_func then
-		focus_region_func(focus_region_object)
+	if delay then
+		delay()
 	end
 end
 

soluna

@@ -13,7 +13,7 @@ local ui = require "core.rules".ui
 local version = require "gameplay.version"
 local table = table
 local math = math
-global ipairs, error, pairs, print, tostring
+global ipairs, error, pairs, print, tostring, setmetatable
 
 local DRAWLIST = {}
 local TESTLIST = {}
@@ -428,6 +428,20 @@ function M.additional(list)
 	ADDITIONAL_LIST = list
 end
 
+local focus_map = {
+	map = {
+		map = true,
+		homeworld = true,
+		colony = true,
+	}
+}
+
+setmetatable(focus_map, { __index = function (o,k)
+	local r = { [k] = true }
+	o[k] = r
+	return r
+end })
+
 function M.draw(count)
 	if CAMERA then open_camera() end
 	-- todo : find a better place to check unfocus :
@@ -437,7 +451,8 @@ function M.draw(count)
 		map_focus(focus_state.lost)
 	end
 	-- todo : support multiple hud layer
-	widget.draw(BATCH, DRAWLIST.hud, mouse.focus_region())
+	local r = mouse.focus_region()
+	widget.draw(BATCH, DRAWLIST.hud, r and focus_map[r])
 
 	if CAMERA then close_camera() end
 	if DESC then