game-projects/sonic-radiance
1
0
Fork 0
Code Issues 33 Pull requests Projects 3 Releases Wiki Activity

fix: propagate cancel widget

Browse source
This commit is contained in:
Kazhnuz 2021-08-28 21:15:01 +02:00
parent 9ed2b44be2
commit 88a68d2f98
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sonic-radiance.love/birb/modules/gui/menus/model/init.lua
View file

@ -142,9 +142,9 @@ end
-- CANCEL FUNCTIONS -- CANCEL FUNCTIONS
-- Add a widget as a "cancel" function -- Add a widget as a "cancel" function
function MenuModel:setCancelWidget() function MenuModel:setCancelWidget(id)
local page = self:getCurrentPage() local page = self:getCurrentPage()
page:setCancelWidget() page:setCancelWidget(id)
end end
function MenuModel:getCancelWidget() function MenuModel:getCancelWidget()

15
sonic-radiance.love/birb/modules/gui/menus/model/page.lua
View file

@ -66,8 +66,8 @@ end
-- All the actions callback used by the widgets -- All the actions callback used by the widgets
function Page:cancelAction() function Page:cancelAction()
if (self.cancel ~= 0) then if (self:getCancelWidget() ~= 0) then
self:action(self.cancel, "key") self:action(self:getCancelWidget(), "key")
end end
end end
@ -134,12 +134,19 @@ end
-- Add a widget as a "cancel" function -- Add a widget as a "cancel" function
function Page:setCancelWidget(id) function Page:setCancelWidget(id)
self.cancel = #self.widgets if (id == nil) then
id = #self.widgets
end
self.cancel = id
end end
function Page:getCancelWidget(id) function Page:getCancelWidget()
if (self.cancel == "last") then
return #self.widgets
else
return self.cancel return self.cancel
end end
end
-- CURSOR FUNCTIONS -- CURSOR FUNCTIONS
-- Set or move the cursor of the menu -- Set or move the cursor of the menu