Update to 1.6 version (#6)
* Merge from origin https://gitlab.com/Tsoukie/clique-3.3.5 * Linting * Ascension Modifications Fixes Spec swap and adds the 12 slots Fixes ascension compact raid frame support Fixes ascension spell panel integration * Add profile dropdown to binding window * Fix menu buttons showing as invisible * cleanup xml button definitions * enable or disable Bind Spell button when spellbook is visible * give the labels a bit more spacing for default UI
This commit is contained in:
committed by
GitHub
parent
c2bb10665d
commit
9c36ee6e47
@@ -0,0 +1,45 @@
|
||||
--[[-------------------------------------------------------------------------
|
||||
-- BlizzardFrames.lua
|
||||
--
|
||||
-- This file contains the definitions of the blizzard frame integration
|
||||
-- options. These settings will not apply until the user interface is
|
||||
-- reloaded.
|
||||
--
|
||||
-- Events registered:
|
||||
-- * ADDON_LOADED - To watch for loading of the ArenaUI
|
||||
-------------------------------------------------------------------------]] --
|
||||
local addonName, addon = ...
|
||||
local L = addon.L
|
||||
|
||||
-- Register a Blizzard frame for click-casting, with some additional protection
|
||||
function addon:RegisterBlizzardFrame(frame)
|
||||
-- Stash the frame in case we later convert it
|
||||
local frameName = frame
|
||||
|
||||
-- Convert a frame name to the global object
|
||||
if type(frame) == "string" then
|
||||
frameName = frame
|
||||
frame = _G[frameName]
|
||||
if not frame then
|
||||
addon:Printf("Error registering frame: %s", tostring(frameName))
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if not frame then
|
||||
addon:Printf("Unable to register empty frame: %s", tostring(frameName))
|
||||
return
|
||||
end
|
||||
|
||||
-- Never allow forbidden frames, we can't do anything with those!
|
||||
local forbidden = frame.IsForbidden and frame:IsForbidden()
|
||||
if forbidden then return end
|
||||
|
||||
local buttonish = frame and frame.RegisterForClicks
|
||||
local protected = frame.IsProtected and frame:IsProtected()
|
||||
local anchorRestricted = frame.IsAnchoringRestricted and frame:IsAnchoringRestricted()
|
||||
|
||||
-- A frame must be a button, and must be protected, and must not be a nameplate, anchor restricted
|
||||
local valid = buttonish and protected and (not anchorRestricted)
|
||||
if valid then addon:RegisterFrame(frame) end
|
||||
end
|
||||
@@ -0,0 +1,77 @@
|
||||
--[[-------------------------------------------------------------------------
|
||||
-- Blizzard_wrath.lua
|
||||
--
|
||||
-- This file contains the definitions of the blizzard frame integration
|
||||
-- options. These settings will not apply until the user interface is
|
||||
-- reloaded.
|
||||
--
|
||||
-- Events registered:
|
||||
-- * ADDON_LOADED - To watch for loading of the ArenaUI
|
||||
-------------------------------------------------------------------------]] --
|
||||
local addonName, addon = ...
|
||||
local L = addon.L
|
||||
|
||||
-- addon:Printf("Loading Blizzard_wrath integration")
|
||||
|
||||
local waitForAddon
|
||||
|
||||
function addon:IntegrateBlizzardFrames()
|
||||
self:Wrath_BlizzSelfFrames()
|
||||
self:Wrath_BlizzPartyFrames()
|
||||
self:Wrath_BlizzBossFrames()
|
||||
|
||||
-- Check for both standard CompactRaidFrame and Ascension version
|
||||
if IsAddOnLoaded("CompactRaidFrame") or IsAddOnLoaded("Ascension_CompactRaidFrames") then
|
||||
self:Wrath_BlizzCompactUnitFrames()
|
||||
else
|
||||
waitForAddon = CreateFrame("Frame")
|
||||
waitForAddon["CompactRaidFrame"] = "Wrath_BlizzCompactUnitFrames"
|
||||
waitForAddon["Ascension_CompactRaidFrames"] = "Wrath_BlizzCompactUnitFrames"
|
||||
end
|
||||
|
||||
if waitForAddon then
|
||||
waitForAddon:RegisterEvent("ADDON_LOADED")
|
||||
waitForAddon:SetScript("OnEvent", function(frame, event, ...) if waitForAddon[...] then self[waitForAddon[...]](self) end end)
|
||||
|
||||
if not next(waitForAddon) then
|
||||
waitForAddon:UnregisterEvent("ADDON_LOADED")
|
||||
waitForAddon:SetScript("OnEvent", nil)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function addon:Wrath_BlizzCompactUnitFrames()
|
||||
if not addon.settings.blizzframes.compactraid then return end
|
||||
|
||||
-- For standard CompactRaidFrame addon
|
||||
if CompactUnitFrame_SetUpFrame then hooksecurefunc("CompactUnitFrame_SetUpFrame", function(frame, ...) addon:RegisterBlizzardFrame(frame) end) end
|
||||
|
||||
-- For Ascension CompactRaidFrames addon
|
||||
if CompactUnitMixin then hooksecurefunc(CompactUnitMixin, "SetUpFrame", function(frame, ...) addon:RegisterBlizzardFrame(frame) end) end
|
||||
end
|
||||
|
||||
function addon:Wrath_BlizzSelfFrames()
|
||||
local frames = {"PlayerFrame", "PetFrame", "TargetFrame", "TargetFrameToT"}
|
||||
|
||||
-- Add focus frames for Wrath
|
||||
table.insert(frames, "FocusFrame")
|
||||
table.insert(frames, "FocusFrameToT")
|
||||
|
||||
for idx, frame in ipairs(frames) do if addon.settings.blizzframes[frame] then addon:RegisterBlizzardFrame(frame) end end
|
||||
end
|
||||
|
||||
function addon:Wrath_BlizzPartyFrames()
|
||||
if not addon.settings.blizzframes.party then return end
|
||||
|
||||
local frames = {"PartyMemberFrame1", "PartyMemberFrame2", "PartyMemberFrame3", "PartyMemberFrame4", -- "PartyMemberFrame5",
|
||||
"PartyMemberFrame1PetFrame", "PartyMemberFrame2PetFrame", "PartyMemberFrame3PetFrame", "PartyMemberFrame4PetFrame" -- "PartyMemberFrame5PetFrame",
|
||||
}
|
||||
for idx, frame in ipairs(frames) do addon:RegisterBlizzardFrame(frame) end
|
||||
end
|
||||
|
||||
function addon:Wrath_BlizzBossFrames()
|
||||
if not addon.settings.blizzframes.boss then return end
|
||||
|
||||
local frames = {"Boss1TargetFrame", "Boss2TargetFrame", "Boss3TargetFrame", "Boss4TargetFrame"}
|
||||
for idx, frame in ipairs(frames) do addon:RegisterBlizzardFrame(frame) end
|
||||
end
|
||||
Reference in New Issue
Block a user