Commit 7a620d4c authored by Simpy's avatar Simpy 🐹

11.40

parents 95af8804 325f17a9
## Interface: 80300
## Author: Elv, Simpy
## Version: 11.39
## Version: 11.40
## Title: |cff1784d1ElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
......
......@@ -86,7 +86,7 @@ function B:SizeAndPositionBagBar()
end
end
for j = LE_BAG_FILTER_FLAG_EQUIPMENT, NUM_LE_BAG_FILTER_FLAGS do
local active = GetBagSlotFlag(i, j)
local active = GetBagSlotFlag(i - 1, j)
if active then
button.ElvUIFilterIcon:SetTexture(B.BAG_FILTER_ICONS[j])
button.ElvUIFilterIcon:SetShown(E.db.bags.showAssignedIcon)
......@@ -94,6 +94,7 @@ function B:SizeAndPositionBagBar()
button.ignoreBorderColors = true --dont allow these border colors to update for now
break -- this loop
else
button.ElvUIFilterIcon:SetShown(false)
button:SetBackdropBorderColor(unpack(E.media.bordercolor))
button.ignoreBorderColors = nil --restore these borders to be updated
end
......@@ -169,4 +170,5 @@ function B:LoadBagBar()
B:SizeAndPositionBagBar()
E:CreateMover(B.BagBar, 'BagsMover', L["Bags"], nil, nil, nil, nil, nil, 'bags,general')
B:RegisterEvent('BAG_SLOT_FLAGS_UPDATED', 'SizeAndPositionBagBar')
end
......@@ -44,19 +44,27 @@ function S:AddonList()
local name, title, _, loadable, reason = GetAddOnInfo(index)
-- Get the character from the current list (nil is all characters)
local checkall
local character = UIDropDownMenu_GetSelectedValue(AddonCharacterDropDown)
if character == true then character = nil end
if character == true then
character = nil
else
checkall = GetAddOnEnableState(nil, index)
end
local checkboxState = GetAddOnEnableState(character, index)
local enabled = checkboxState > 0
local checkstate = GetAddOnEnableState(character, index)
local checkbox = _G["AddonListEntry"..i.."Enabled"]
local checktex = checkbox:GetCheckedTexture()
local enabled = checkstate > 0
string:FontTemplate(font, 13, 'NONE')
entry.Status:FontTemplate(font, 11, 'NONE')
entry.Status:SetTextColor(1.0, not enabled and 0.2 or 1.0, 0.2)
entry.Reload:FontTemplate(font, 11, 'NONE')
entry.Reload:SetTextColor(1.0, 0.6, 0.2)
entry.LoadAddonButton.Text:FontTemplate(font, 11, 'NONE')
if loadable or (enabled and (reason == "DEP_DEMAND_LOADED" or reason == "DEMAND_LOADED")) then
if enabled and (loadable or reason == "DEP_DEMAND_LOADED" or reason == "DEMAND_LOADED") then
string:SetTextColor(0.9, 0.9, 0.9)
elseif enabled and reason ~= "DEP_DISABLED" then
string:SetTextColor(1.0, 0.2, 0.2)
......@@ -64,11 +72,16 @@ function S:AddonList()
string:SetTextColor(0.3, 0.3, 0.3)
end
if not enabled then
if not enabled and checkall == 1 then
checktex:SetVertexColor(0.3, 0.3, 0.3)
checktex:SetDesaturated(false)
checktex:Show()
elseif checkstate == 0 then
checktex:Hide()
end
if not enabled or reason == "DEP_DISABLED" then
string:SetText(gsub(title or name, '|c%x%x%x%x%x%x%x%x(.-)|?r?','%1'))
entry.Status:SetTextColor(1.0, 0.2, 0.2)
else
entry.Status:SetTextColor(1.0, 1.0, 0.2)
end
end
end)
......
......@@ -1413,7 +1413,7 @@ function S:Initialize()
tex:SetDesaturated(false)
tex:SetVertexColor(unpack(E.media.rgbvaluecolor))
elseif checkButton.state == 1 then
tex:SetVertexColor(1, .82, 0, 0.8)
tex:SetVertexColor(0.6, 0.6, 0.6)
end
end
end)
......
......@@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateD
--Global Settings
G.general = {
UIScale = 0.64,
version = 11.39,
version = 11.40,
locale = E:GetLocale(),
eyefinity = 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