Commit 002a426c authored by Simpy's avatar Simpy 🐹

Merge branch 'development'

parents fe53220b 6c4c6afe
## Interface: 80100
## Author: Elv
## Version: 11.08
## Version: 11.09
## Title: |cfffe7b2cElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
......
......@@ -131,9 +131,11 @@ local function updateArenaPreparation(self, event)
local specID = GetArenaOpponentSpec(id)
if(specID) then
-- disable the unit watch so we can forcefully show the object ourselves
self:Disable()
self:RegisterEvent('ARENA_OPPONENT_UPDATE', updateArenaPreparation)
if(self:IsEnabled()) then
-- disable the unit watch so we can forcefully show the object ourselves
self:Disable()
self:RegisterEvent('ARENA_OPPONENT_UPDATE', updateArenaPreparation)
end
-- update Health and Power (if available) with "fake" data
updateArenaPreparationElements(self, event, 'Health', specID)
......
......@@ -1076,13 +1076,13 @@ end
function AB:LAB_MouseUp()
if self.config.clickOnDown then
self.pushed:SetAlpha(0)
self:GetPushedTexture():SetAlpha(0)
end
end
function AB:LAB_MouseDown()
if self.config.clickOnDown then
self.pushed:SetAlpha(1)
self:GetPushedTexture():SetAlpha(1)
end
end
......@@ -1106,14 +1106,14 @@ end
function AB:LAB_CooldownUpdate(button, _, duration)
if button._state_type ~= "action" then return end
button.cooldown.hideText = (button.cooldown.isChargeCooldown and not AB.db.chargeCooldown) or nil
button.cooldown.hideText = (button.cooldown.isChargeCooldown and (AB.db.chargeCooldown == false)) or nil
SetButtonDesaturation(button, AB.db.desaturateOnCooldown, duration)
end
function AB:ToggleCooldownOptions()
for button in pairs(LAB.actionButtons) do
local oldstate = button.cooldown.hideText
button.cooldown.hideText = (button.cooldown.isChargeCooldown and not AB.db.chargeCooldown) or nil
button.cooldown.hideText = (button.cooldown.isChargeCooldown and (AB.db.chargeCooldown == false)) or nil
if button.cooldown.timer and (oldstate ~= button.cooldown.hideText) then
E:Cooldown_ForceUpdate(button.cooldown.timer)
end
......@@ -1121,7 +1121,7 @@ function AB:ToggleCooldownOptions()
SetButtonDesaturation(button, AB.db.desaturateOnCooldown)
end
if AB.db.desaturateOnCooldown or AB.db.chargeCooldown then
if AB.db.desaturateOnCooldown or (AB.db.chargeCooldown == false) then
LAB.RegisterCallback(AB, "OnCooldownUpdate", AB.LAB_CooldownUpdate)
LAB.RegisterCallback(AB, "OnCooldownDone", AB.LAB_CooldownDone)
else
......
......@@ -110,6 +110,8 @@ function TOTEMS:Initialize()
frame.iconTexture = frame:CreateTexture(nil, 'ARTWORK')
frame.iconTexture:SetInside()
frame.iconTexture:SetTexCoord(unpack(E.TexCoords))
frame.iconTexture:SetSnapToPixelGrid(false)
frame.iconTexture:SetTexelSnappingBias(0)
frame.cooldown = CreateFrame('Cooldown', frame:GetName()..'Cooldown', frame, 'CooldownFrameTemplate')
frame.cooldown:SetReverse(true)
......
......@@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
--Global Settings
G.general = {
UIScale = 0.64,
version = 11.08,
version = 11.09,
eyefinity = false,
ignoreScalePopup = false,
smallerWorldMap = true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment