from retail
This commit is contained in:
@@ -17,7 +17,7 @@ local conditionChecksTimers = {};
|
|||||||
conditionChecksTimers.recheckTime = {};
|
conditionChecksTimers.recheckTime = {};
|
||||||
conditionChecksTimers.recheckHandle = {};
|
conditionChecksTimers.recheckHandle = {};
|
||||||
|
|
||||||
local function OnDelete(event, uid)
|
local function OnDelete(_, uid)
|
||||||
checkConditions[uid] = nil
|
checkConditions[uid] = nil
|
||||||
conditionChecksTimers.recheckTime[uid] = nil
|
conditionChecksTimers.recheckTime[uid] = nil
|
||||||
if (conditionChecksTimers.recheckHandle[uid]) then
|
if (conditionChecksTimers.recheckHandle[uid]) then
|
||||||
@@ -27,7 +27,7 @@ local function OnDelete(event, uid)
|
|||||||
end
|
end
|
||||||
conditionChecksTimers.recheckHandle[uid] = nil
|
conditionChecksTimers.recheckHandle[uid] = nil
|
||||||
|
|
||||||
for event, funcs in pairs(dynamicConditions) do
|
for _, funcs in pairs(dynamicConditions) do
|
||||||
funcs[uid] = nil
|
funcs[uid] = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -616,7 +616,6 @@ local function ConstructConditionFunction(data)
|
|||||||
ret = ret .. " local recheckTime;\n"
|
ret = ret .. " local recheckTime;\n"
|
||||||
ret = ret .. " local now = GetTime();\n"
|
ret = ret .. " local now = GetTime();\n"
|
||||||
|
|
||||||
local normalConditionCount = data.conditions and #data.conditions;
|
|
||||||
-- First Loop gather which conditions are active
|
-- First Loop gather which conditions are active
|
||||||
ret = ret .. " if (not hideRegion) then\n"
|
ret = ret .. " if (not hideRegion) then\n"
|
||||||
local recheckCode = ""
|
local recheckCode = ""
|
||||||
|
|||||||
@@ -1459,7 +1459,7 @@ function GenericTrigger.Add(data, region)
|
|||||||
if (trigger.custom_type == "stateupdate") then
|
if (trigger.custom_type == "stateupdate") then
|
||||||
tsuConditionVariables = WeakAuras.LoadFunction("return function() return \n" .. (trigger.customVariables or "") .. "\n end");
|
tsuConditionVariables = WeakAuras.LoadFunction("return function() return \n" .. (trigger.customVariables or "") .. "\n end");
|
||||||
if not tsuConditionVariables then
|
if not tsuConditionVariables then
|
||||||
tsuConditionVariables = function() return end
|
tsuConditionVariables = function() end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -9,11 +9,10 @@ local ceil, min = ceil, min
|
|||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local GetTalentInfo = GetTalentInfo
|
local GetTalentInfo = GetTalentInfo
|
||||||
local UnitClass, UnitHealth, UnitHealthMax, UnitName, UnitPower, UnitPowerMax = UnitClass, UnitHealth, UnitHealthMax, UnitName, UnitPower, UnitPowerMax
|
local UnitClass = UnitClass
|
||||||
local GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon = GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon
|
local GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon = GetSpellInfo, GetItemInfo, GetItemCount, GetItemIcon
|
||||||
local GetShapeshiftFormInfo, GetShapeshiftForm = GetShapeshiftFormInfo, GetShapeshiftForm
|
local GetShapeshiftFormInfo, GetShapeshiftForm = GetShapeshiftFormInfo, GetShapeshiftForm
|
||||||
local GetRuneCooldown, UnitCastingInfo, UnitChannelInfo = GetRuneCooldown, UnitCastingInfo, UnitChannelInfo
|
local UnitDetailedThreatSituation = UnitDetailedThreatSituation
|
||||||
local UnitDetailedThreatSituation, UnitThreatSituation = UnitDetailedThreatSituation, UnitThreatSituation
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, Private = ...
|
local AddonName, Private = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
local MSQ, MSQ_Version = LibStub("Masque", true);
|
local MSQ, MSQ_Version = LibStub("Masque", true);
|
||||||
if MSQ then
|
if MSQ then
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, Private = ...
|
local AddonName, Private = ...
|
||||||
|
|
||||||
local texture_types = WeakAuras.StopMotion.texture_types;
|
|
||||||
local texture_data = WeakAuras.StopMotion.texture_data;
|
local texture_data = WeakAuras.StopMotion.texture_data;
|
||||||
local animation_types = WeakAuras.StopMotion.animation_types;
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local default = {
|
local default = {
|
||||||
|
|||||||
@@ -3,9 +3,6 @@ local AddonName, Private = ...
|
|||||||
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local root2 = math.sqrt(2);
|
|
||||||
local halfroot2 = root2/2;
|
|
||||||
|
|
||||||
local default = {
|
local default = {
|
||||||
texture = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Auras\\Aura3",
|
texture = "Interface\\Addons\\WeakAuras\\PowerAurasMedia\\Auras\\Aura3",
|
||||||
desaturate = false,
|
desaturate = false,
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, Private = ...
|
local AddonName, Private = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local LCG = LibStub("LibCustomGlow-1.0")
|
local LCG = LibStub("LibCustomGlow-1.0")
|
||||||
local MSQ, MSQ_Version = LibStub("Masque", true);
|
local MSQ, MSQ_Version = LibStub("Masque", true);
|
||||||
if MSQ then
|
if MSQ then
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, Private = ...
|
local AddonName, Private = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
Private.barmodels = {}
|
Private.barmodels = {}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, Private = ...
|
local AddonName, Private = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local default = function(parentType)
|
local default = function()
|
||||||
return {
|
return {
|
||||||
tick_visible = true,
|
tick_visible = true,
|
||||||
tick_color = {1, 1, 1, 1},
|
tick_color = {1, 1, 1, 1},
|
||||||
|
|||||||
@@ -27,16 +27,12 @@ local tostring, string_char, strsplit = tostring, string.char, strsplit
|
|||||||
local pairs, type, unpack = pairs, type, unpack
|
local pairs, type, unpack = pairs, type, unpack
|
||||||
local error = error
|
local error = error
|
||||||
local bit_band, bit_lshift, bit_rshift = bit.band, bit.lshift, bit.rshift
|
local bit_band, bit_lshift, bit_rshift = bit.band, bit.lshift, bit.rshift
|
||||||
local coroutine = coroutine
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras;
|
local WeakAuras = WeakAuras;
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local versionString = WeakAuras.versionString;
|
local versionString = WeakAuras.versionString;
|
||||||
|
|
||||||
local regionOptions = WeakAuras.regionOptions;
|
|
||||||
local regionTypes = WeakAuras.regionTypes;
|
|
||||||
|
|
||||||
-- Local functions
|
-- Local functions
|
||||||
local decodeB64, GenerateUniqueID
|
local decodeB64, GenerateUniqueID
|
||||||
local CompressDisplay, ShowTooltip, TableToString, StringToTable
|
local CompressDisplay, ShowTooltip, TableToString, StringToTable
|
||||||
|
|||||||
+18
-24
@@ -13,11 +13,11 @@ local UnitClass, UnitExists, UnitGUID, UnitAffectingCombat, GetInstanceInfo, IsI
|
|||||||
= UnitClass, UnitExists, UnitGUID, UnitAffectingCombat, GetInstanceInfo, IsInInstance
|
= UnitClass, UnitExists, UnitGUID, UnitAffectingCombat, GetInstanceInfo, IsInInstance
|
||||||
local UnitIsUnit, GetRaidRosterInfo, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
|
local UnitIsUnit, GetRaidRosterInfo, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
|
||||||
= UnitIsUnit, GetRaidRosterInfo, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
|
= UnitIsUnit, GetRaidRosterInfo, UnitInVehicle, UnitHasVehicleUI, GetSpellInfo
|
||||||
local SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, GetTime, GetSpellLink, GetItemInfo
|
local SendChatMessage, UnitInBattleground, UnitInRaid, UnitInParty, GetTime
|
||||||
= SendChatMessage, GetChannelName, UnitInBattleground, UnitInRaid, UnitInParty, GetTime, GetSpellLink, GetItemInfo
|
= SendChatMessage, UnitInBattleground, UnitInRaid, UnitInParty, GetTime
|
||||||
local CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
|
local CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
|
||||||
= CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
|
= CreateFrame, IsShiftKeyDown, GetScreenWidth, GetScreenHeight, GetCursorPosition, UpdateAddOnCPUUsage, GetFrameCPUUsage, debugprofilestop
|
||||||
local debugstack, IsSpellKnown = debugstack, IsSpellKnown
|
local debugstack = debugstack
|
||||||
|
|
||||||
local ADDON_NAME = "WeakAuras"
|
local ADDON_NAME = "WeakAuras"
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
@@ -245,8 +245,6 @@ local fallbacksStates = {};
|
|||||||
-- List of all trigger systems, contains each system once
|
-- List of all trigger systems, contains each system once
|
||||||
local triggerSystems = {}
|
local triggerSystems = {}
|
||||||
|
|
||||||
local from_files = {};
|
|
||||||
|
|
||||||
local timers = {}; -- Timers for autohiding, keyed on id, triggernum, cloneid
|
local timers = {}; -- Timers for autohiding, keyed on id, triggernum, cloneid
|
||||||
WeakAuras.timers = timers;
|
WeakAuras.timers = timers;
|
||||||
|
|
||||||
@@ -1008,8 +1006,8 @@ do -- Archive stuff
|
|||||||
end
|
end
|
||||||
|
|
||||||
function WeakAuras.LoadFromArchive(storeType, storeID)
|
function WeakAuras.LoadFromArchive(storeType, storeID)
|
||||||
local Archivist = OpenArchive()
|
local Archive = OpenArchive()
|
||||||
return Archivist:Load(storeType, storeID)
|
return Archive:Load(storeType, storeID)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1505,7 +1503,7 @@ local function UnloadAll()
|
|||||||
Private.CancelAnimation(WeakAuras.regions[id].region, true, true, true, true, true, true)
|
Private.CancelAnimation(WeakAuras.regions[id].region, true, true, true, true, true, true)
|
||||||
end
|
end
|
||||||
if clones[id] then
|
if clones[id] then
|
||||||
for cloneId, region in pairs(clones[id]) do
|
for _, region in pairs(clones[id]) do
|
||||||
Private.CancelAnimation(region, true, true, true, true, true, true)
|
Private.CancelAnimation(region, true, true, true, true, true, true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -1667,7 +1665,7 @@ function WeakAuras.Delete(data)
|
|||||||
|
|
||||||
UIDtoID[data.uid] = nil
|
UIDtoID[data.uid] = nil
|
||||||
if(data.controlledChildren) then
|
if(data.controlledChildren) then
|
||||||
for index, childId in pairs(data.controlledChildren) do
|
for _, childId in pairs(data.controlledChildren) do
|
||||||
local childData = db.displays[childId];
|
local childData = db.displays[childId];
|
||||||
if(childData) then
|
if(childData) then
|
||||||
childData.parent = nil;
|
childData.parent = nil;
|
||||||
@@ -1684,7 +1682,7 @@ function WeakAuras.Delete(data)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if clones[id] then
|
if clones[id] then
|
||||||
for cloneId, region in pairs(clones[id]) do
|
for _, region in pairs(clones[id]) do
|
||||||
region:Collapse();
|
region:Collapse();
|
||||||
Private.CancelAnimation(region, true, true, true, true, true, true)
|
Private.CancelAnimation(region, true, true, true, true, true, true)
|
||||||
end
|
end
|
||||||
@@ -1857,9 +1855,9 @@ function Private.Convert(data, newType)
|
|||||||
tremove(data.subRegions, index)
|
tremove(data.subRegions, index)
|
||||||
-- Adjust conditions!
|
-- Adjust conditions!
|
||||||
if data.conditions then
|
if data.conditions then
|
||||||
for conditionIndex, condition in ipairs(data.conditions) do
|
for _, condition in ipairs(data.conditions) do
|
||||||
if type(condition.changes) == "table" then
|
if type(condition.changes) == "table" then
|
||||||
for changeIndex, change in ipairs(condition.changes) do
|
for _, change in ipairs(condition.changes) do
|
||||||
if change.property then
|
if change.property then
|
||||||
local subRegionIndex, property = change.property:match("^sub%.(%d+)%.(.*)")
|
local subRegionIndex, property = change.property:match("^sub%.(%d+)%.(.*)")
|
||||||
subRegionIndex = tonumber(subRegionIndex)
|
subRegionIndex = tonumber(subRegionIndex)
|
||||||
@@ -2493,7 +2491,7 @@ function WeakAuras.PreAdd(data)
|
|||||||
Private.Modernize(data);
|
Private.Modernize(data);
|
||||||
WeakAuras.validate(data, WeakAuras.data_stub);
|
WeakAuras.validate(data, WeakAuras.data_stub);
|
||||||
if data.subRegions then
|
if data.subRegions then
|
||||||
for index, subRegionData in ipairs(data.subRegions) do
|
for _, subRegionData in ipairs(data.subRegions) do
|
||||||
local subType = subRegionData.type
|
local subType = subRegionData.type
|
||||||
if subType and Private.subRegionTypes[subType] then
|
if subType and Private.subRegionTypes[subType] then
|
||||||
if Private.subRegionTypes[subType].supports(data.regionType) then
|
if Private.subRegionTypes[subType].supports(data.regionType) then
|
||||||
@@ -2874,7 +2872,7 @@ end
|
|||||||
function Private.SetAllStatesHidden(id, triggernum)
|
function Private.SetAllStatesHidden(id, triggernum)
|
||||||
local triggerState = WeakAuras.GetTriggerStateForTrigger(id, triggernum);
|
local triggerState = WeakAuras.GetTriggerStateForTrigger(id, triggernum);
|
||||||
local changed = false
|
local changed = false
|
||||||
for id, state in pairs(triggerState) do
|
for _, state in pairs(triggerState) do
|
||||||
changed = changed or state.show
|
changed = changed or state.show
|
||||||
state.show = false;
|
state.show = false;
|
||||||
state.changed = true;
|
state.changed = true;
|
||||||
@@ -3078,7 +3076,6 @@ function Private.HandleGlowAction(actions, region)
|
|||||||
)
|
)
|
||||||
then
|
then
|
||||||
local glow_frame
|
local glow_frame
|
||||||
local original_glow_frame
|
|
||||||
if actions.glow_frame_type == "FRAMESELECTOR" then
|
if actions.glow_frame_type == "FRAMESELECTOR" then
|
||||||
if actions.glow_frame:sub(1, 10) == "WeakAuras:" then
|
if actions.glow_frame:sub(1, 10) == "WeakAuras:" then
|
||||||
local frame_name = actions.glow_frame:sub(11)
|
local frame_name = actions.glow_frame:sub(11)
|
||||||
@@ -3537,7 +3534,6 @@ end
|
|||||||
|
|
||||||
function Private.ApplyFrameLevel(region, frameLevel)
|
function Private.ApplyFrameLevel(region, frameLevel)
|
||||||
frameLevel = frameLevel or GetFrameLevelFor(region.id)
|
frameLevel = frameLevel or GetFrameLevelFor(region.id)
|
||||||
local subforegroundIndex = 0
|
|
||||||
if region.subRegions then
|
if region.subRegions then
|
||||||
for index, subRegion in pairs(region.subRegions) do
|
for index, subRegion in pairs(region.subRegions) do
|
||||||
if subRegion.type == "subbackground" then
|
if subRegion.type == "subbackground" then
|
||||||
@@ -3714,7 +3710,7 @@ do
|
|||||||
visibleFakeStates[id] = false
|
visibleFakeStates[id] = false
|
||||||
if triggerState[id] then
|
if triggerState[id] then
|
||||||
local changed = false
|
local changed = false
|
||||||
for triggernum, state in ipairs(triggerState[id]) do
|
for triggernum in ipairs(triggerState[id]) do
|
||||||
changed = Private.SetAllStatesHidden(id, triggernum) or changed
|
changed = Private.SetAllStatesHidden(id, triggernum) or changed
|
||||||
end
|
end
|
||||||
if changed then
|
if changed then
|
||||||
@@ -3729,7 +3725,7 @@ do
|
|||||||
if (WeakAuras.IsOptionsOpen() and visibleFakeStates[id]) then
|
if (WeakAuras.IsOptionsOpen() and visibleFakeStates[id]) then
|
||||||
local data = WeakAuras.GetData(id)
|
local data = WeakAuras.GetData(id)
|
||||||
if (data) then
|
if (data) then
|
||||||
for triggernum, trigger in ipairs(data.triggers) do
|
for triggernum in ipairs(data.triggers) do
|
||||||
Private.SetAllStatesHidden(id, triggernum)
|
Private.SetAllStatesHidden(id, triggernum)
|
||||||
local triggerSystem = GetTriggerSystem(data, triggernum)
|
local triggerSystem = GetTriggerSystem(data, triggernum)
|
||||||
if triggerSystem and triggerSystem.CreateFakeStates then
|
if triggerSystem and triggerSystem.CreateFakeStates then
|
||||||
@@ -3853,7 +3849,7 @@ local function evaluateTriggerStateTriggers(id)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Private.ActivateAuraEnvironment(nil);
|
Private.ActivateAuraEnvironment();
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
end
|
end
|
||||||
@@ -3981,7 +3977,7 @@ function Private.UpdatedTriggerState(id)
|
|||||||
end
|
end
|
||||||
elseif (show) then
|
elseif (show) then
|
||||||
local needsFallback = true;
|
local needsFallback = true;
|
||||||
for cloneId, state in pairs(activeTriggerState) do
|
for _, state in pairs(activeTriggerState) do
|
||||||
if (state.show) then
|
if (state.show) then
|
||||||
needsFallback = false;
|
needsFallback = false;
|
||||||
break;
|
break;
|
||||||
@@ -3998,7 +3994,7 @@ function Private.UpdatedTriggerState(id)
|
|||||||
if (show and not oldShow) then -- Hide => Show
|
if (show and not oldShow) then -- Hide => Show
|
||||||
ApplyStatesToRegions(id, newActiveTrigger, activeTriggerState);
|
ApplyStatesToRegions(id, newActiveTrigger, activeTriggerState);
|
||||||
elseif (not show and oldShow) then -- Show => Hide
|
elseif (not show and oldShow) then -- Show => Hide
|
||||||
for cloneId, clone in pairs(clones[id]) do
|
for _, clone in pairs(clones[id]) do
|
||||||
clone:Collapse()
|
clone:Collapse()
|
||||||
end
|
end
|
||||||
if WeakAuras.regions[id] then
|
if WeakAuras.regions[id] then
|
||||||
@@ -4075,7 +4071,6 @@ function Private.RunCustomTextFunc(region, customFunc)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function ReplaceValuePlaceHolders(textStr, region, customFunc, state, formatter)
|
local function ReplaceValuePlaceHolders(textStr, region, customFunc, state, formatter)
|
||||||
local regionValues = region.values;
|
|
||||||
local value;
|
local value;
|
||||||
if string.sub(textStr, 1, 1) == "c" then
|
if string.sub(textStr, 1, 1) == "c" then
|
||||||
local custom
|
local custom
|
||||||
@@ -4386,7 +4381,7 @@ function Private.CreateFormatters(input, getter, withoutColor)
|
|||||||
local formatters = {}
|
local formatters = {}
|
||||||
Private.ParseTextStr(input, function(symbol)
|
Private.ParseTextStr(input, function(symbol)
|
||||||
if not seenSymbols[symbol] then
|
if not seenSymbols[symbol] then
|
||||||
local triggerNum, sym = string.match(symbol, "(.+)%.(.+)")
|
local _, sym = string.match(symbol, "(.+)%.(.+)")
|
||||||
sym = sym or symbol
|
sym = sym or symbol
|
||||||
if sym == "i" then
|
if sym == "i" then
|
||||||
-- Do nothing
|
-- Do nothing
|
||||||
@@ -5107,7 +5102,6 @@ function WeakAuras.ParseNameCheck(name)
|
|||||||
-- state: 2: In Realm
|
-- state: 2: In Realm
|
||||||
-- state: -1: Escape Name
|
-- state: -1: Escape Name
|
||||||
-- state: -2: In Escape Realm
|
-- state: -2: In Escape Realm
|
||||||
local index = 1
|
|
||||||
local state = 1
|
local state = 1
|
||||||
local name = ""
|
local name = ""
|
||||||
local realm = ""
|
local realm = ""
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local tinsert, tconcat, tremove, wipe = table.insert, table.concat, table.remove, wipe
|
local tinsert, tremove, wipe = table.insert, table.remove, wipe
|
||||||
local select, pairs, next, type, unpack = select, pairs, next, type, unpack
|
local select, pairs, type, unpack = select, pairs, type, unpack
|
||||||
local tostring, error = tostring, error
|
local error = error
|
||||||
|
|
||||||
local Type, Version = "WeakAurasDisplayButton", 59
|
local Type, Version = "WeakAurasDisplayButton", 59
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
|||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local select, pairs, print = select, pairs, print
|
local select, pairs = select, pairs
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
|||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local select, pairs, print = select, pairs, print
|
local select, pairs = select, pairs
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ if not WeakAuras.IsCorrectVersion() then
|
|||||||
end
|
end
|
||||||
|
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
local L = WeakAuras.L
|
|
||||||
|
|
||||||
local pairs, next, type, unpack = pairs, next, type, unpack
|
local pairs, next, type, unpack = pairs, next, type, unpack
|
||||||
|
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ local AddonName, OptionsPrivate = ...
|
|||||||
local WeakAuras = WeakAuras;
|
local WeakAuras = WeakAuras;
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local debug = false;
|
|
||||||
|
|
||||||
local function addSpace(args, order)
|
local function addSpace(args, order)
|
||||||
args["space" .. order] = {
|
args["space" .. order] = {
|
||||||
type = "description",
|
type = "description",
|
||||||
@@ -64,18 +62,6 @@ local function addSpace(args, order)
|
|||||||
return order;
|
return order;
|
||||||
end
|
end
|
||||||
|
|
||||||
local function addHalfSpace(args, order)
|
|
||||||
args["space" .. order] = {
|
|
||||||
type = "description",
|
|
||||||
name = "",
|
|
||||||
image = function() return "", 0, 0 end,
|
|
||||||
order = order,
|
|
||||||
width = WeakAuras.halfWidth
|
|
||||||
}
|
|
||||||
order = order + 1;
|
|
||||||
return order;
|
|
||||||
end
|
|
||||||
|
|
||||||
local function compareValues(a, b, propertytype)
|
local function compareValues(a, b, propertytype)
|
||||||
if (propertytype == "color") then
|
if (propertytype == "color") then
|
||||||
if (type(a) ~= "table" or type(b) ~= "table") then
|
if (type(a) ~= "table" or type(b) ~= "table") then
|
||||||
@@ -768,7 +754,7 @@ local function addControlsForChange(args, order, data, conditionVariable, totalA
|
|||||||
args["condition" .. i .. "value" .. j] = {
|
args["condition" .. i .. "value" .. j] = {
|
||||||
type = "toggle",
|
type = "toggle",
|
||||||
width = WeakAuras.normalWidth,
|
width = WeakAuras.normalWidth,
|
||||||
name = blueIfNoValue(data, conditions[i].changes[j], "value", "message_dest_isunit", L["Is Unit"], L["Is Unit"]),
|
name = blueIfNoValue(data, conditions[i].changes[j], "value", "message_dest_isunit", L["Is Unit"]),
|
||||||
desc = descIfNoValue(data, conditions[i].changes[j], "value", "message_dest_isunit", propertyType),
|
desc = descIfNoValue(data, conditions[i].changes[j], "value", "message_dest_isunit", propertyType),
|
||||||
order = order,
|
order = order,
|
||||||
get = function()
|
get = function()
|
||||||
@@ -792,7 +778,7 @@ local function addControlsForChange(args, order, data, conditionVariable, totalA
|
|||||||
desc = descMessage,
|
desc = descMessage,
|
||||||
order = order,
|
order = order,
|
||||||
get = message_getter,
|
get = message_getter,
|
||||||
set = setValueComplex("message", true)
|
set = setValueComplex("message")
|
||||||
}
|
}
|
||||||
order = order + 1;
|
order = order + 1;
|
||||||
|
|
||||||
|
|||||||
@@ -318,7 +318,6 @@ local function GetCustomTriggerOptions(data, triggernum)
|
|||||||
test = "function",
|
test = "function",
|
||||||
events = "table",
|
events = "table",
|
||||||
values = "table",
|
values = "table",
|
||||||
display = "string"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local function validateCustomVariables(variables)
|
local function validateCustomVariables(variables)
|
||||||
@@ -491,10 +490,10 @@ local function GetGenericTriggerOptions(data, triggernum)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (triggerType == "custom") then
|
if (triggerType == "custom") then
|
||||||
WeakAuras.Mixin(options, GetCustomTriggerOptions(data, triggernum, trigger));
|
WeakAuras.Mixin(options, GetCustomTriggerOptions(data, triggernum));
|
||||||
elseif (OptionsPrivate.Private.category_event_prototype[triggerType]) then
|
elseif (OptionsPrivate.Private.category_event_prototype[triggerType]) then
|
||||||
local prototypeOptions;
|
local prototypeOptions;
|
||||||
local trigger, untrigger = data.triggers[triggernum].trigger, data.triggers[triggernum].untrigger;
|
local trigger = data.triggers[triggernum].trigger
|
||||||
if(OptionsPrivate.Private.event_prototypes[trigger.event]) then
|
if(OptionsPrivate.Private.event_prototypes[trigger.event]) then
|
||||||
prototypeOptions = OptionsPrivate.ConstructOptions(OptionsPrivate.Private.event_prototypes[trigger.event], data, 10, triggernum);
|
prototypeOptions = OptionsPrivate.ConstructOptions(OptionsPrivate.Private.event_prototypes[trigger.event], data, 10, triggernum);
|
||||||
if (trigger.event == "Combat Log") then
|
if (trigger.event == "Combat Log") then
|
||||||
|
|||||||
@@ -6,9 +6,7 @@ local pairs = pairs
|
|||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, IsMouseButtonDown, SetCursor, GetMouseFocus, MouseIsOver, ResetCursor
|
local CreateFrame, IsMouseButtonDown, SetCursor, GetMouseFocus, MouseIsOver, ResetCursor
|
||||||
= CreateFrame, IsMouseButtonDown, SetCursor, GetMouseFocus, MouseIsOver, ResetCursor
|
= CreateFrame, IsMouseButtonDown, SetCursor, GetMouseFocus, MouseIsOver, ResetCursor
|
||||||
|
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ local pairs = pairs
|
|||||||
local CreateFrame, GetSpellInfo = CreateFrame, GetSpellInfo
|
local CreateFrame, GetSpellInfo = CreateFrame, GetSpellInfo
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
@@ -33,9 +32,6 @@ local function ConstructIconPicker(frame)
|
|||||||
local function iconPickerFill(subname, doSort)
|
local function iconPickerFill(subname, doSort)
|
||||||
scroll:ReleaseChildren();
|
scroll:ReleaseChildren();
|
||||||
|
|
||||||
local distances = {};
|
|
||||||
local names = {};
|
|
||||||
|
|
||||||
-- Work around special numbers such as inf and nan
|
-- Work around special numbers such as inf and nan
|
||||||
if (tonumber(subname)) then
|
if (tonumber(subname)) then
|
||||||
local spellId = tonumber(subname);
|
local spellId = tonumber(subname);
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
-- Lua APIs
|
|
||||||
local strtrim, strsub = strtrim, strsub
|
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local GetTime, CreateFrame = GetTime, CreateFrame
|
local CreateFrame = CreateFrame
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ local rad = rad
|
|||||||
local CreateFrame = CreateFrame
|
local CreateFrame = CreateFrame
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ local pairs = pairs
|
|||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local IsShiftKeyDown, CreateFrame = IsShiftKeyDown, CreateFrame
|
local IsShiftKeyDown, CreateFrame = IsShiftKeyDown, CreateFrame
|
||||||
|
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ local pairs, type, error = pairs, type, error
|
|||||||
local _G = _G
|
local _G = _G
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, PlaySound, IsAddOnLoaded, LoadAddOn, UnitName
|
local GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, UnitName
|
||||||
= GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, PlaySound, IsAddOnLoaded, LoadAddOn, UnitName
|
= GetScreenWidth, GetScreenHeight, CreateFrame, GetAddOnInfo, UnitName
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ local pairs, next, type = pairs, next, type
|
|||||||
local CreateFrame = CreateFrame
|
local CreateFrame = CreateFrame
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
local AceConfigDialog = LibStub("AceConfigDialog-3.0")
|
|
||||||
|
|
||||||
local WeakAuras = WeakAuras
|
local WeakAuras = WeakAuras
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|||||||
@@ -611,7 +611,7 @@ local function modifyThumbnail(parent, borderframe, data, fullModify, width, hei
|
|||||||
end
|
end
|
||||||
|
|
||||||
if data then
|
if data then
|
||||||
local name, icon = WeakAuras.GetNameAndIcon(data)
|
local _, icon = WeakAuras.GetNameAndIcon(data)
|
||||||
borderframe:SetIcon(icon)
|
borderframe:SetIcon(icon)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -635,7 +635,7 @@ local function createIcon()
|
|||||||
};
|
};
|
||||||
|
|
||||||
-- Create and configure thumbnail
|
-- Create and configure thumbnail
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data, nil, 32, 18);
|
modifyThumbnail(UIParent, thumbnail, data, nil, 32, 18);
|
||||||
thumbnail:SetIcon("Interface\\Icons\\INV_Sword_62");
|
thumbnail:SetIcon("Interface\\Icons\\INV_Sword_62");
|
||||||
|
|
||||||
|
|||||||
@@ -557,7 +557,7 @@ local function modifyThumbnail(parent, frame, data)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function createIcon()
|
local function createIcon()
|
||||||
local thumbnail = createThumbnail(UIParent)
|
local thumbnail = createThumbnail()
|
||||||
thumbnail.defaultIcon = createAnimatedDefaultIcon(thumbnail)
|
thumbnail.defaultIcon = createAnimatedDefaultIcon(thumbnail)
|
||||||
return thumbnail
|
return thumbnail
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -455,7 +455,7 @@ local function createDistributeAlignOptions(id, data)
|
|||||||
end
|
end
|
||||||
local spaced;
|
local spaced;
|
||||||
local previousData;
|
local previousData;
|
||||||
for index, childId in pairs(data.controlledChildren) do
|
for _, childId in pairs(data.controlledChildren) do
|
||||||
local childData = WeakAuras.GetData(childId);
|
local childData = WeakAuras.GetData(childId);
|
||||||
if(childData) then
|
if(childData) then
|
||||||
local _, bottom, _, top = getRect(childData);
|
local _, bottom, _, top = getRect(childData);
|
||||||
@@ -672,7 +672,7 @@ end
|
|||||||
|
|
||||||
-- Modify preview thumbnail
|
-- Modify preview thumbnail
|
||||||
local function modifyThumbnail(parent, frame, data)
|
local function modifyThumbnail(parent, frame, data)
|
||||||
function frame:SetIcon(path)
|
function frame:SetIcon()
|
||||||
if data.groupIcon then
|
if data.groupIcon then
|
||||||
local success = frame.icon:SetTexture(data.groupIcon)
|
local success = frame.icon:SetTexture(data.groupIcon)
|
||||||
if success then
|
if success then
|
||||||
@@ -693,12 +693,12 @@ local function modifyThumbnail(parent, frame, data)
|
|||||||
frame.defaultIcon:Show()
|
frame.defaultIcon:Show()
|
||||||
end
|
end
|
||||||
|
|
||||||
frame:SetIcon(nil)
|
frame:SetIcon()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Create "new region" preview
|
-- Create "new region" preview
|
||||||
local function createIcon()
|
local function createIcon()
|
||||||
local thumbnail = createThumbnail(UIParent)
|
local thumbnail = createThumbnail()
|
||||||
thumbnail.defaultIcon = createDefaultIcon(thumbnail)
|
thumbnail.defaultIcon = createDefaultIcon(thumbnail)
|
||||||
return thumbnail
|
return thumbnail
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -188,8 +188,8 @@ local function createIcon()
|
|||||||
width = 40
|
width = 40
|
||||||
};
|
};
|
||||||
|
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data, nil, 50);
|
modifyThumbnail(UIParent, thumbnail, data);
|
||||||
|
|
||||||
return thumbnail;
|
return thumbnail;
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -713,7 +713,7 @@ local function createIcon()
|
|||||||
backgroundColor = {0.5, 0.5, 0.5, 0.5}
|
backgroundColor = {0.5, 0.5, 0.5, 0.5}
|
||||||
};
|
};
|
||||||
|
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data, nil, 32);
|
modifyThumbnail(UIParent, thumbnail, data, nil, 32);
|
||||||
|
|
||||||
thumbnail.elapsed = 0;
|
thumbnail.elapsed = 0;
|
||||||
|
|||||||
@@ -689,7 +689,7 @@ local function createIcon()
|
|||||||
animationType = "progress"
|
animationType = "progress"
|
||||||
};
|
};
|
||||||
|
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data, nil, 75);
|
modifyThumbnail(UIParent, thumbnail, data, nil, 75);
|
||||||
|
|
||||||
thumbnail.elapsed = 0;
|
thumbnail.elapsed = 0;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ local AddonName, OptionsPrivate = ...
|
|||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20;
|
local screenWidth = math.ceil(GetScreenWidth() / 20) * 20
|
||||||
|
|
||||||
local indentWidth = 0.15
|
local indentWidth = 0.15
|
||||||
local hiddenFontExtra = function()
|
local hiddenFontExtra = function()
|
||||||
@@ -294,7 +294,7 @@ local function createOptions(id, data)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local total, index = 0, 1
|
local total, index = 0, 1
|
||||||
for child in OptionsPrivate.Private.TraverseLeafsOrAura(data) do
|
for _ in OptionsPrivate.Private.TraverseLeafsOrAura(data) do
|
||||||
total = total + 1
|
total = total + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -414,7 +414,7 @@ local function createIcon()
|
|||||||
displayText = "World\nof\nWarcraft";
|
displayText = "World\nof\nWarcraft";
|
||||||
};
|
};
|
||||||
|
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data);
|
modifyThumbnail(UIParent, thumbnail, data);
|
||||||
thumbnail.mask:SetPoint("BOTTOMLEFT", thumbnail, "BOTTOMLEFT", 3, 3);
|
thumbnail.mask:SetPoint("BOTTOMLEFT", thumbnail, "BOTTOMLEFT", 3, 3);
|
||||||
thumbnail.mask:SetPoint("TOPRIGHT", thumbnail, "TOPRIGHT", -3, -3);
|
thumbnail.mask:SetPoint("TOPRIGHT", thumbnail, "TOPRIGHT", -3, -3);
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ local function createIcon()
|
|||||||
rotation = 0;
|
rotation = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
local thumbnail = createThumbnail(UIParent);
|
local thumbnail = createThumbnail();
|
||||||
modifyThumbnail(UIParent, thumbnail, data, nil, 50);
|
modifyThumbnail(UIParent, thumbnail, data, nil, 50);
|
||||||
|
|
||||||
return thumbnail;
|
return thumbnail;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ local L = WeakAuras.L;
|
|||||||
|
|
||||||
do
|
do
|
||||||
local function subCreateOptions(parentData, data, index, subIndex)
|
local function subCreateOptions(parentData, data, index, subIndex)
|
||||||
local order = 9
|
|
||||||
local options = {
|
local options = {
|
||||||
__title = L["Background"],
|
__title = L["Background"],
|
||||||
__order = 1,
|
__order = 1,
|
||||||
@@ -32,7 +31,6 @@ end
|
|||||||
|
|
||||||
do
|
do
|
||||||
local function subCreateOptions(parentData, data, index, subIndex)
|
local function subCreateOptions(parentData, data, index, subIndex)
|
||||||
local order = 9
|
|
||||||
local options = {
|
local options = {
|
||||||
__title = L["Foreground"],
|
__title = L["Foreground"],
|
||||||
__order = 1,
|
__order = 1,
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20;
|
|
||||||
|
|
||||||
local function createOptions(parentData, data, index, subIndex)
|
local function createOptions(parentData, data, index, subIndex)
|
||||||
local options = {
|
local options = {
|
||||||
__title = L["Border %s"]:format(subIndex),
|
__title = L["Border %s"]:format(subIndex),
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20;
|
|
||||||
|
|
||||||
|
|
||||||
local indentWidth = 0.15
|
local indentWidth = 0.15
|
||||||
|
|
||||||
|
|
||||||
local function createOptions(parentData, data, index, subIndex)
|
local function createOptions(parentData, data, index, subIndex)
|
||||||
|
|
||||||
local hiddenGlowExtra = function()
|
local hiddenGlowExtra = function()
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local function createOptions(parentData, data, index, subIndex)
|
local function createOptions(parentData, data, index, subIndex)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0")
|
|
||||||
local L = WeakAuras.L
|
local L = WeakAuras.L
|
||||||
|
|
||||||
local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20
|
local screenWidth, screenHeight = math.ceil(GetScreenWidth() / 20) * 20, math.ceil(GetScreenHeight() / 20) * 20
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
if not WeakAuras.IsCorrectVersion() or not WeakAuras.IsLibsOK() then return end
|
||||||
local AddonName, OptionsPrivate = ...
|
local AddonName, OptionsPrivate = ...
|
||||||
|
|
||||||
local SharedMedia = LibStub("LibSharedMedia-3.0");
|
|
||||||
local L = WeakAuras.L;
|
local L = WeakAuras.L;
|
||||||
|
|
||||||
local indentWidth = WeakAuras.normalWidth * 0.06
|
|
||||||
|
|
||||||
local function createOptions(parentData, data, index, subIndex)
|
local function createOptions(parentData, data, index, subIndex)
|
||||||
local hiddentickextras = function()
|
local hiddentickextras = function()
|
||||||
return OptionsPrivate.IsCollapsed("subtext", "subtext", "tickextras" .. index, true)
|
return OptionsPrivate.IsCollapsed("subtext", "subtext", "tickextras" .. index, true)
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ end
|
|||||||
|
|
||||||
local function GetGlobalOptions(data)
|
local function GetGlobalOptions(data)
|
||||||
|
|
||||||
local triggerCount = 0
|
|
||||||
local globalTriggerOptions = {
|
local globalTriggerOptions = {
|
||||||
__title = L["Trigger Combination"],
|
__title = L["Trigger Combination"],
|
||||||
__order = 1,
|
__order = 1,
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ local AddonName, OptionsPrivate = ...
|
|||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local tinsert, tremove, wipe = table.insert, table.remove, wipe
|
local tinsert, tremove, wipe = table.insert, table.remove, wipe
|
||||||
local pairs, type, unpack = pairs, type, unpack
|
local pairs, type = pairs, type
|
||||||
local loadstring, error = loadstring, error
|
local error = error
|
||||||
local coroutine = coroutine
|
local coroutine = coroutine
|
||||||
local _G = _G
|
local _G = _G
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user