Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Safe widgets reordering api #3941

Merged
merged 9 commits into from
Nov 20, 2024
Merged

Safe widgets reordering api #3941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4337e06
Add a mechanism so widgetHandler reordering api can be used safely.
saurtron Nov 18, 2024
fc6b237
Check reordersNeeded on DrawScreen and Update, and manual reorder at
saurtron Nov 18, 2024
2ee7ce3
Hook UpdateWidgetCallInRaw and InsertWidgetRaw methods inside profiler
saurtron Nov 19, 2024
99c454b
Use EnableWidgetRaw and DisableWidgetRaw inside tests.
saurtron Nov 19, 2024
877ff6b
Cleaner way to hook PerformReorders for special methods.
saurtron Nov 19, 2024
67242ac
Recursive reordering to account for reorderings with further reordering
saurtron Nov 19, 2024
8072c88
widgetHandler:HookReorderPostMethods -> widgetHandler:HookReorderSpec…
saurtron Nov 19, 2024
018ef3e
Some top level methods need returning several values.
saurtron Nov 20, 2024
4d75b8b
Just wrap two return parameters for all top level callins.
saurtron Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions luaui/Widgets/Tests/cmd_blueprint/test_cmd_blueprint_line.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)

widget = widgetHandler:FindWidget(widgetName)
assert(widget)
Expand All @@ -29,9 +29,9 @@ end
function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end

Spring.SetCameraState(initialCameraState)
Expand Down
8 changes: 4 additions & 4 deletions luaui/Widgets/Tests/cmd_blueprint/test_cmd_blueprint_single.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)

widget = widgetHandler:FindWidget(widgetName)
assert(widget)
Expand All @@ -29,9 +29,9 @@ end
function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end

Spring.SetCameraState(initialCameraState)
Expand Down
8 changes: 4 additions & 4 deletions luaui/Widgets/Tests/gui_selfd_icons/test_gui_selfd_icons_armasp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)
end

function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end
end

Expand Down
8 changes: 4 additions & 4 deletions luaui/Widgets/Tests/gui_selfd_icons/test_gui_selfd_icons_armpw.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)
end

function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end
end

Expand Down
8 changes: 4 additions & 4 deletions luaui/Widgets/Tests/gui_selfd_icons/test_gui_selfd_icons_armvp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)
end

function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end
end

Expand Down
8 changes: 4 additions & 4 deletions luaui/Widgets/TestsExamples/gui_battle_resource_tracker/test_gui_battle_resource_tracker.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ function setup()

initialWidgetActive = widgetHandler.knownWidgets[widgetName].active
if initialWidgetActive then
widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
end
widgetHandler:EnableWidget(widgetName, true)
widgetHandler:EnableWidgetRaw(widgetName, true)
end

function cleanup()
Test.clearMap()

widgetHandler:DisableWidget(widgetName)
widgetHandler:DisableWidgetRaw(widgetName)
if initialWidgetActive then
widgetHandler:EnableWidget(widgetName, false)
widgetHandler:EnableWidgetRaw(widgetName, false)
end
end

Expand Down
12 changes: 6 additions & 6 deletions luaui/Widgets/dbg_widget_profiler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ local function StartHook()
Spring.Echo("hooked all callins")

--// hook the UpdateCallin function
oldUpdateWidgetCallIn = wh.UpdateWidgetCallIn
wh.UpdateWidgetCallIn = function(self, name, w)
oldUpdateWidgetCallIn = wh.UpdateWidgetCallInRaw
wh.UpdateWidgetCallInRaw = function(self, name, w)
local listName = name .. 'List'
local ciList = self[listName]
if ciList then
Expand All @@ -236,8 +236,8 @@ local function StartHook()
Spring.Echo("hooked UpdateCallin")

--// hook the InsertWidget function
oldInsertWidget = wh.InsertWidget
widgetHandler.InsertWidget = function(self, widget)
oldInsertWidget = wh.InsertWidgetRaw
widgetHandler.InsertWidgetRaw = function(self, widget)
if widget == nil then
return
end
Expand Down Expand Up @@ -283,9 +283,9 @@ local function StopHook()
Spring.Echo("unhooked all callins")

--// unhook the UpdateCallin and InsertWidget functions
wh.UpdateWidgetCallIn = oldUpdateWidgetCallIn
wh.UpdateWidgetCallInRaw = oldUpdateWidgetCallIn
Spring.Echo("unhooked UpdateCallin")
wh.InsertWidget = oldInsertWidget
wh.InsertWidgetRaw = oldInsertWidget
Spring.Echo("unhooked InsertWidget")
end

Expand Down
Loading