diff --git a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_AuraBars/oUF_AuraBars.lua b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_AuraBars/oUF_AuraBars.lua index a71679f..5cc402c 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_AuraBars/oUF_AuraBars.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_AuraBars/oUF_AuraBars.lua @@ -84,8 +84,7 @@ local function CreateAuraBar(oUF, anchor) local statusBar = CreateFrame("StatusBar", nil, frame) statusBar:SetStatusBarTexture(auraBarParent.barTexture or [[Interface\TargetingFrame\UI-StatusBar]]) statusBar:SetAlpha(auraBarParent.fgalpha or 1) - statusBar:SetPoint("TOPLEFT", frame, "TOPLEFT", 1, -1) - statusBar:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -1, 1) + statusBar:SetAllPoints(frame) frame.statusBar = statusBar if auraBarParent.down == true then @@ -119,9 +118,8 @@ local function CreateAuraBar(oUF, anchor) statusBar.iconHolder.UpdateTooltip = UpdateTooltip statusBar.icon = statusBar.iconHolder:CreateTexture(nil, 'OVERLAY') - statusBar.icon:SetTexCoord(.07, .93, .07, .93) - statusBar.icon:SetPoint("TOPLEFT", statusBar.iconHolder, "TOPLEFT", 1, -1) - statusBar.icon:SetPoint("BOTTOMRIGHT", statusBar.iconHolder, "BOTTOMRIGHT", -1, 1) + statusBar.icon:SetTexCoord(.1, .9, .1, .9) + statusBar.icon:SetAllPoints(statusBar.iconHolder) statusBar.spelltime = statusBar:CreateFontString(nil, 'ARTWORK') statusBar.spelltime:SetFont(auraBarParent.textFont or [[Fonts\FRIZQT__.TTF]], auraBarParent.textSize or 10, auraBarParent.textOutline or "NONE") diff --git a/Interface/AddOns/SVUI/packages/actionbar/common/keybinds.lua b/Interface/AddOns/SVUI/packages/actionbar/common/keybinds.lua index 70cf84b..9124d29 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/common/keybinds.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/common/keybinds.lua @@ -269,7 +269,7 @@ end local BinderButton_OnEnter = function(self) local parent = self.button:GetParent() if parent and parent._fade then - SuperVillain:SecureFadeIn(parent, 0.2, parent:GetAlpha(), parent.db.alpha) + SuperVillain:SecureFadeIn(parent, 0.2, parent:GetAlpha(), parent._alpha) end end; diff --git a/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua b/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua index 08a6326..af1cde5 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/aurabars.lua @@ -37,7 +37,7 @@ local AuraRemover_OnClick = function(self) local n = self:GetParent().aura.name; local id = self:GetParent().aura.spellID; if id then - SuperVillain:AddonMessage(format(L["The spell "%s" has been added to the Blocked unitframe aura filter."], n)) + SuperVillain:AddonMessage(format(L["The spell '%s' has been added to the Blocked unitframe aura filter."], n)) SuperVillain.Filters:Change("Blocked", id, {["enable"] = true, ["priority"] = 0}) MOD:RefreshUnitFrames() end @@ -46,7 +46,7 @@ end local function PostCreateAuraBars(self) self:SetPanelTemplate("Bar") local auraBar = self.statusBar - auraBar.iconHolder:SetFixedPanelTemplate("Transparent") + auraBar.iconHolder:SetPanelTemplate("Transparent") auraBar.iconHolder:RegisterForClicks("RightButtonUp") auraBar.iconHolder:SetScript("OnClick", AuraRemover_OnClick) end @@ -66,10 +66,10 @@ function MOD:ColorizeAuraBars() end if color then auraBar.statusBar:SetStatusBarColor(unpack(color)) - auraBar:SetBackdropColor(color[1] * 0.25, color[2] * 0.25, color[3] * 0.25) + auraBar:SetBackdropColor(color[1] * 0.25, color[2] * 0.25, color[3] * 0.25, 0.25) else local r, g, b = auraBar.statusBar:GetStatusBarColor() - auraBar:SetBackdropColor(r * 0.25, g * 0.25, b * 0.25) + auraBar:SetBackdropColor(r * 0.25, g * 0.25, b * 0.25, 0.25) end end end @@ -157,8 +157,8 @@ function MOD:CreateAuraBarHeader(frame,unitName) local auraBarParent = CreateFrame('Frame',nil,frame) auraBarParent.parent = frame; auraBarParent.PostCreateBar = PostCreateAuraBars; - auraBarParent.gap = -1; - auraBarParent.spacing = -1; + auraBarParent.gap = 1; + auraBarParent.spacing = 1; auraBarParent.spark = true; auraBarParent.filter = self.AuraBarFilter; auraBarParent.PostUpdate = self.ColorizeAuraBars; diff --git a/Interface/AddOns/SVUI/packages/unit/common/auras.lua b/Interface/AddOns/SVUI/packages/unit/common/auras.lua index 61307a0..dfb6aac 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/auras.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/auras.lua @@ -84,13 +84,13 @@ local AuraRemover_OnClick = function(self) if not IsShiftKeyDown() then return end local name = self.name; if name then - SuperVillain:AddonMessage(format(L['The spell "%s" has been added to the Blocked unitframe aura filter.'], name)) + SuperVillain:AddonMessage(format(L["The spell '%s' has been added to the Blocked unitframe aura filter."], name)) SuperVillain.Filters["Blocked"]["spells"][name] = {["enable"] = true, ["priority"] = 0} MOD:RefreshUnitFrames() end end -local function PostCreateAuraIcon(aura) +local function PostCreateAuraIcon(self, aura) aura.cd.noOCC = true; aura.cd.noCooldownCount = true; aura.cd:SetReverse() @@ -120,8 +120,8 @@ local function PostCreateAuraIcon(aura) aura:SetScript("OnClick", AuraRemover_OnClick) aura.styled = true end - -local function PostUpdateAuraIcon(unit, button, index, offset, filter, isDebuff, duration, timeLeft) +-- unit, icon, index, offset +local function PostUpdateAuraIcon(self, unit, button, index, offset) local name, _, _, _, dtype, duration, expiration, _, isStealable = UnitAura(unit, index, button.filter) local isFriend = UnitIsFriend('player', unit) == 1 and true or false if button.isDebuff then diff --git a/Interface/AddOns/SVUI/packages/unit/common/media.lua b/Interface/AddOns/SVUI/packages/unit/common/media.lua index 083d6b5..a80e1c9 100644 --- a/Interface/AddOns/SVUI/packages/unit/common/media.lua +++ b/Interface/AddOns/SVUI/packages/unit/common/media.lua @@ -112,18 +112,19 @@ function MOD:RefreshUnitMedia(unitName, updateUpvalues) local frame = self[unitName] local panel = frame.InfoPanel - - if(panel.Name and unitDB.name) then - panel.Name:SetFont(LSM:Fetch("font", unitDB.name.font), unitDB.name.fontSize, unitDB.name.fontOutline) - end - if(panel.Health) then - panel.Health:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) - end - if(panel.Power) then - panel.Power:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) - end - if(panel.Misc) then - panel.Misc:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) + if(panel) then + if(panel.Name and unitDB.name) then + panel.Name:SetFont(LSM:Fetch("font", unitDB.name.font), unitDB.name.fontSize, unitDB.name.fontOutline) + end + if(panel.Health) then + panel.Health:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) + end + if(panel.Power) then + panel.Power:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) + end + if(panel.Misc) then + panel.Misc:SetFont(CURRENT_FONT, CURRENT_FONTSIZE, CURRENT_FONTOUTLINE) + end end if(frame.Power and (unitDB.power and unitDB.power.enable)) then frame.Power:SetStatusBarTexture(CURRENT_BAR_TEXTURE) diff --git a/Interface/AddOns/SVUI/packages/unit/frames/basic/player.lua b/Interface/AddOns/SVUI/packages/unit/frames/basic/player.lua index 131aaa7..28cff0b 100644 --- a/Interface/AddOns/SVUI/packages/unit/frames/basic/player.lua +++ b/Interface/AddOns/SVUI/packages/unit/frames/basic/player.lua @@ -21,6 +21,7 @@ local oUF_SuperVillain = ns.oUF local assert = enforce; assert(oUF_SuperVillain, "SVUI was unable to locate oUF.") local ceil,tinsert = math.ceil,table.insert +local LSM = LibStub("LibSharedMedia-3.0") --[[ ########################################################## BUILD FUNCTION diff --git a/Interface/AddOns/SVUI/system/cartography.lua b/Interface/AddOns/SVUI/system/cartography.lua index 1e91596..c591b87 100644 --- a/Interface/AddOns/SVUI/system/cartography.lua +++ b/Interface/AddOns/SVUI/system/cartography.lua @@ -294,10 +294,24 @@ do if(map1 == map2 and floor1 == floor2) then local chunk = _mapdata[map1]; if(floor1 ~= 0) then - chunk = rawget(chunk, floor1) or _dungeons[chunk.origin][floor1]; + chunk = rawget(chunk, floor1) end - xDelta = (x2 - x1) * chunk.width; - yDelta = (y2 - y1) * chunk.height; + local w,h = 1,1 + if(not chunk) then + if(_dungeons[chunk.origin] and _dungeons[chunk.origin][floor1]) then + chunk = _dungeons[chunk.origin][floor1] + w = chunk.width + h = chunk.height + else + w = 1 + h = 1 + end + else + w = chunk.width + h = chunk.height + end + xDelta = (x2 - x1) * w; + yDelta = (y2 - y1) * h; else local map1 = _mapdata[map1]; local map2 = _mapdata[map2];