Fix unit tooltip docking for non-startup layouts (FAForever#6216)

GodFuper · May 30, 2024 · fbdddaa · fbdddaa
1 parent b3de37c
commit fbdddaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog/snippets/fix.6216.md b/changelog/snippets/fix.6216.md
@@ -0,0 +1 @@
+- (#6216) Fix incorrect unit tooltip docking after switching layout in-game (default alt-up/alt-down).
diff --git a/lua/ui/game/unitview.lua b/lua/ui/game/unitview.lua
@@ -19,7 +19,7 @@ local Prefs = import("/lua/user/prefs.lua")
 local EnhancementCommon = import("/lua/enhancementcommon.lua")
 local options = Prefs.GetFromCurrentProfile('options')
 local GetUnitRolloverInfo = import("/lua/keymap/selectedinfo.lua").GetUnitRolloverInfo
-local unitViewLayout = import(UIUtil.GetLayoutFilename('unitview'))
+local unitViewLayout = nil -- Holds the current layout, updated by SetLayout().
 local unitviewDetail = import("/lua/ui/game/unitviewdetail.lua")
 local Grid = import("/lua/maui/grid.lua").Grid
 local Construction = import("/lua/ui/game/construction.lua")
@@ -739,12 +739,14 @@ function ShowROBox()
 end
 
 function SetLayout(layout)
+    unitViewLayout = import(UIUtil.GetLayoutFilename('unitview'))
     unitViewLayout.SetLayout()
 end
 
 function SetupUnitViewLayout(mapGroup, orderControl)
     controls.parent = mapGroup
     controls.orderPanel = orderControl
+    unitViewLayout = import(UIUtil.GetLayoutFilename('unitview')) -- SetLayout() will set this too but let's make sure CreateUI() does not use nil, even though it only sets up an OnFrame function.
     CreateUI()
     SetLayout(UIUtil.currentLayout)
 end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- (#6216) Fix incorrect unit tooltip docking after switching layout in-game (default alt-up/alt-down).