Exiles/coa-weakauras
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

from retail

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