Skip to content

Commit c3a4895

Browse files
committed
the others as well
1 parent 3b80110 commit c3a4895

File tree

3 files changed

+45
-27
lines changed

3 files changed

+45
-27
lines changed

ElvUI/Cata/Modules/Skins/Menu.lua

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,29 @@ local function SkinFrame(frame)
2020
end
2121
end
2222

23-
local function OpenMenu(manager, region, menuDescription)
23+
function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
2424
local menu = manager:GetOpenMenu()
25-
if menu then
26-
-- Initial context menu
27-
SkinFrame(menu)
28-
-- SubMenus
29-
menuDescription:AddMenuAcquiredCallback(SkinFrame)
30-
end
25+
if not menu then return end
26+
27+
SkinFrame(menu) -- Initial context menu
28+
menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
29+
end
30+
31+
function S:OpenMenu(ownerRegion, menuDescription, anchor)
32+
S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
33+
end
34+
35+
function S:OpenContextMenu(ownerRegion, menuDescription)
36+
S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
3137
end
3238

3339
function S:Blizzard_Menu()
3440
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.misc) then return end
3541

3642
local manager = _G.Menu.GetManager()
3743
if manager then
38-
hooksecurefunc(manager, 'OpenMenu', OpenMenu)
39-
hooksecurefunc(manager, 'OpenContextMenu', OpenMenu)
44+
hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
45+
hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
4046
end
4147
end
4248

ElvUI/Classic/Modules/Skins/Menu.lua

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,20 @@ local function SkinFrame(frame)
2020
end
2121
end
2222

23-
function S:OpenMenu(region, menuDescription)
24-
local menu = self:GetOpenMenu() -- self is manager (Menu.GetManager)
25-
if menu then
26-
-- Initial context menu
27-
SkinFrame(menu)
28-
-- SubMenus
29-
menuDescription:AddMenuAcquiredCallback(SkinFrame)
30-
end
23+
function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
24+
local menu = manager:GetOpenMenu()
25+
if not menu then return end
26+
27+
SkinFrame(menu) -- Initial context menu
28+
menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
29+
end
30+
31+
function S:OpenMenu(ownerRegion, menuDescription, anchor)
32+
S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
33+
end
34+
35+
function S:OpenContextMenu(ownerRegion, menuDescription)
36+
S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
3137
end
3238

3339
function S:Blizzard_Menu()
@@ -36,7 +42,7 @@ function S:Blizzard_Menu()
3642
local manager = _G.Menu.GetManager()
3743
if manager then
3844
hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
39-
hooksecurefunc(manager, 'OpenContextMenu', S.OpenMenu)
45+
hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
4046
end
4147
end
4248

ElvUI/Mainline/Modules/Skins/Menu.lua

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,29 @@ local function SkinFrame(frame)
2020
end
2121
end
2222

23-
local function OpenMenu(manager, region, menuDescription)
23+
function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
2424
local menu = manager:GetOpenMenu()
25-
if menu then
26-
-- Initial context menu
27-
SkinFrame(menu)
28-
-- SubMenus
29-
menuDescription:AddMenuAcquiredCallback(SkinFrame)
30-
end
25+
if not menu then return end
26+
27+
SkinFrame(menu) -- Initial context menu
28+
menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
29+
end
30+
31+
function S:OpenMenu(ownerRegion, menuDescription, anchor)
32+
S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
33+
end
34+
35+
function S:OpenContextMenu(ownerRegion, menuDescription)
36+
S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
3137
end
3238

3339
function S:Blizzard_Menu()
3440
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.misc) then return end
3541

3642
local manager = _G.Menu.GetManager()
3743
if manager then
38-
hooksecurefunc(manager, 'OpenMenu', OpenMenu)
39-
hooksecurefunc(manager, 'OpenContextMenu', OpenMenu)
44+
hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
45+
hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
4046
end
4147
end
4248

0 commit comments

Comments
 (0)