13.50

tukui-org · Nov 14, 2023 · 0658c54 · 0658c54
2 parents 54cf2bd + 32f0079
commit 0658c54
Show file tree

Hide file tree

Showing 16 changed files with 335 additions and 294 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/ElvUI/Classic/Modules/Skins/AddonManager.lua b/ElvUI/Classic/Modules/Skins/AddonManager.lua
@@ -2,12 +2,14 @@ local E, L, V, P, G = unpack(ElvUI)
 local S = E:GetModule('Skins')
 
 local _G = _G
-local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
+local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
-local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
-local GetNumAddOns = (C_AddOns and C_AddOns.GetNumAddOns) or GetNumAddOns
+local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
+
+local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
+local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
+local GetNumAddOns = C_AddOns and C_AddOns.GetNumAddOns
 
 function S:AddonList()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end
@@ -50,10 +52,10 @@ function S:AddonList()
 				if character == true then
 					character = nil
 				else
-					checkall = GetAddOnEnableState(nil, index)
+					checkall = GetAddOnEnableState(index)
 				end
 
-				local checkstate = GetAddOnEnableState(character, index)
+				local checkstate = GetAddOnEnableState(index, character)
 				local enabled = checkstate > 0
 
 				entryTitle:SetFontObject('ElvUIFontNormal')
@@ -88,10 +90,18 @@ function S:AddonList()
 				local checktex = checkbox:GetCheckedTexture()
 				if not enabled and checkall == 1 then
 					checktex:SetVertexColor(0.3, 0.3, 0.3)
-					checktex:SetDesaturated(false)
+					checktex:SetDesaturated(true)
 					checktex:Show()
-				elseif checkstate == 0 then
+				elseif not checkstate or checkstate == 0 then
 					checktex:Hide()
+				elseif checkstate == 1 or reason == 'DEP_DISABLED' then
+					checktex:SetVertexColor(0.6, 0.6, 0.6)
+					checktex:SetDesaturated(true)
+					checktex:Show()
+				elseif checkstate == 2 then
+					checktex:SetVertexColor(unpack(E.media.rgbvaluecolor))
+					checktex:SetDesaturated(false)
+					checktex:Show()
 				end
 			end
 		end

diff --git a/ElvUI/Core/General/API.lua b/ElvUI/Core/General/API.lua
@@ -42,10 +42,12 @@ local UnitIsUnit = UnitIsUnit
 local GetSpecialization = (E.Classic or E.Wrath) and LCS.GetSpecialization or GetSpecialization
 local GetSpecializationInfo = (E.Classic or E.Wrath) and LCS.GetSpecializationInfo or GetSpecializationInfo
 
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
 local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
 local SetCVar = C_CVar.SetCVar
 
+local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
+local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
+
 local C_TooltipInfo_GetUnit = C_TooltipInfo and C_TooltipInfo.GetUnit
 local C_TooltipInfo_GetHyperlink = C_TooltipInfo and C_TooltipInfo.GetHyperlink
 local C_TooltipInfo_GetInventoryItem = C_TooltipInfo and C_TooltipInfo.GetInventoryItem
@@ -409,7 +411,12 @@ do
 end
 
 function E:Dump(object, inspect)
-	if GetAddOnEnableState(E.myname, 'Blizzard_DebugTools') == 0 then
+	if C_AddOns_GetAddOnEnableState then
+		if C_AddOns_GetAddOnEnableState('Blizzard_DebugTools', E.myname) == 0 then
+			E:Print('Blizzard_DebugTools is disabled.')
+			return
+		end
+	elseif GetAddOnEnableState(E.myname, 'Blizzard_DebugTools') == 0 then
 		E:Print('Blizzard_DebugTools is disabled.')
 		return
 	end

diff --git a/ElvUI/Core/General/Core.lua b/ElvUI/Core/General/Core.lua
@@ -29,10 +29,12 @@ local UnitGUID = UnitGUID
 local GetSpecialization = (E.Classic or E.Wrath) and LCS.GetSpecialization or GetSpecialization
 
 local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
 local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
 local GetCVarBool = C_CVar.GetCVarBool
 
+local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
+local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
+
 local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
 local LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_INSTANCE
 local C_ChatInfo_SendAddonMessage = C_ChatInfo.SendAddonMessage
@@ -513,7 +515,11 @@ do
 end
 
 function E:IsAddOnEnabled(addon)
-	return GetAddOnEnableState(E.myname, addon) == 2
+	if C_AddOns_GetAddOnEnableState then
+		return C_AddOns_GetAddOnEnableState(addon, E.myname) == 2
+	else
+		return GetAddOnEnableState(E.myname, addon) == 2
+	end
 end
 
 function E:IsIncompatible(module, addons)

diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua
@@ -17,11 +17,13 @@ local UIParent = UIParent
 local UIDropDownMenu_SetAnchor = UIDropDownMenu_SetAnchor
 
 local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
 local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
 local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
 local IsHardcoreActive = C_GameRules and C_GameRules.IsHardcoreActive
 
+local C_AddOns_GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
+local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
+
 -- GLOBALS: ElvCharacterDB, ElvPrivateDB, ElvDB, ElvCharacterData, ElvPrivateData, ElvData
 
 local AceAddon, AceAddonMinor = _G.LibStub('AceAddon-3.0')
@@ -326,7 +328,11 @@ function E:OnInitialize()
 		E.Minimap:SetGetMinimapShape() -- This is just to support for other mods, keep below UIMult
 	end
 
-	if GetAddOnEnableState(E.myname, 'Tukui') == 2 then
+	if C_AddOns_GetAddOnEnableState then
+		if C_AddOns_GetAddOnEnableState('Tukui', E.myname) == 2 then
+			E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE')
+		end
+	elseif GetAddOnEnableState(E.myname, 'Tukui') == 2 then
 		E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE')
 	end
 end
diff --git a/ElvUI/ElvUI_Classic.toc b/ElvUI/ElvUI_Classic.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bClassic|r
 ## Notes: User Interface Replacement
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## SavedVariables: ElvDB, ElvPrivateDB
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque

diff --git a/ElvUI/ElvUI_Mainline.toc b/ElvUI/ElvUI_Mainline.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r
 ## Notes: User Interface Replacement
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## SavedVariables: ElvDB, ElvPrivateDB
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque

diff --git a/ElvUI/ElvUI_Wrath.toc b/ElvUI/ElvUI_Wrath.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bWrath|r
 ## Notes: User Interface Replacement
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## SavedVariables: ElvDB, ElvPrivateDB
 ## SavedVariablesPerCharacter: ElvCharacterDB
 ## OptionalDeps: SharedMedia, Tukui, Masque

diff --git a/ElvUI/Mainline/Modules/Skins/AddonManager.lua b/ElvUI/Mainline/Modules/Skins/AddonManager.lua
@@ -7,8 +7,8 @@ local hooksecurefunc = hooksecurefunc
 
 local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
-local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
+local GetAddOnInfo = C_AddOns and C_AddOns.GetAddOnInfo
+local GetAddOnEnableState = C_AddOns and C_AddOns.GetAddOnEnableState
 
 local function HandleButton(entry, addonIndex)
 	if not entry.isSkinned then
@@ -23,7 +23,7 @@ local function HandleButton(entry, addonIndex)
 	if character == true then
 		character = nil
 	else
-		checkall = GetAddOnEnableState(nil, addonIndex)
+		checkall = GetAddOnEnableState(addonIndex)
 	end
 
 	entry.Title:SetFontObject('ElvUIFontNormal')
@@ -32,7 +32,7 @@ local function HandleButton(entry, addonIndex)
 	entry.Reload:SetTextColor(1.0, 0.3, 0.3)
 	entry.LoadAddonButton.Text:SetFontObject('ElvUIFontSmall')
 
-	local checkstate = GetAddOnEnableState(character, addonIndex)
+	local checkstate = GetAddOnEnableState(addonIndex, character)
 	local enabledForSome = not character and checkstate == 1
 	local enabled = checkstate > 0
 	local disabled = not enabled or enabledForSome

diff --git a/ElvUI/Wrath/Modules/Skins/AddonManager.lua b/ElvUI/Wrath/Modules/Skins/AddonManager.lua
@@ -2,13 +2,14 @@ local E, L, V, P, G = unpack(ElvUI)
 local S = E:GetModule('Skins')
 
 local _G = _G
+local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
 local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
 
-local GetNumAddOns = (C_AddOns and C_AddOns.GetNumAddOns) or GetNumAddOns
-local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
-local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
+local GetNumAddOns = GetNumAddOns
+local GetAddOnInfo = GetAddOnInfo
+local GetAddOnEnableState = GetAddOnEnableState -- eventually this will be on C_AddOns and args swap
 
 function S:AddonList()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end
@@ -89,10 +90,18 @@ function S:AddonList()
 				local checktex = checkbox:GetCheckedTexture()
 				if not enabled and checkall == 1 then
 					checktex:SetVertexColor(0.3, 0.3, 0.3)
-					checktex:SetDesaturated(false)
+					checktex:SetDesaturated(true)
 					checktex:Show()
-				elseif checkstate == 0 then
+				elseif not checkstate or checkstate == 0 then
 					checktex:Hide()
+				elseif checkstate == 1 or reason == 'DEP_DISABLED' then
+					checktex:SetVertexColor(0.6, 0.6, 0.6)
+					checktex:SetDesaturated(true)
+					checktex:Show()
+				elseif checkstate == 2 then
+					checktex:SetVertexColor(unpack(E.media.rgbvaluecolor))
+					checktex:SetDesaturated(false)
+					checktex:Show()
 				end
 			end
 		end

diff --git a/ElvUI_Libraries/ElvUI_Libraries_Classic.toc b/ElvUI_Libraries/ElvUI_Libraries_Classic.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r
 ## Notes: Libraries that power ElvUI
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 11500
 ## OptionalDeps: LibHealComm-4.0
 ## X-oUF: ElvUF

diff --git a/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc b/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r
 ## Notes: Libraries that power ElvUI
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 100200
 ## X-oUF: ElvUF
 ## IconTexture: Interface\AddOns\ElvUI\Core\Media\Textures\LogoAddon

diff --git a/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc b/ElvUI_Libraries/ElvUI_Libraries_Wrath.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bLibraries|r
 ## Notes: Libraries that power ElvUI
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 30403
 ## OptionalDeps: LibHealComm-4.0
 ## X-oUF: ElvUF

diff --git a/ElvUI_Options/ElvUI_Options_Classic.toc b/ElvUI_Options/ElvUI_Options_Classic.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r
 ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 11500
 ## RequiredDeps: ElvUI
 ## LoadOnDemand: 1

diff --git a/ElvUI_Options/ElvUI_Options_Mainline.toc b/ElvUI_Options/ElvUI_Options_Mainline.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r
 ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 100200
 ## RequiredDeps: ElvUI
 ## LoadOnDemand: 1

diff --git a/ElvUI_Options/ElvUI_Options_Wrath.toc b/ElvUI_Options/ElvUI_Options_Wrath.toc
@@ -1,7 +1,7 @@
 ## Title: |cff1784d1ElvUI|r |cfd9b9b9bOptions|r
 ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r
 ## Author: Elv, Simpy
-## Version: 13.49
+## Version: 13.50
 ## Interface: 30403
 ## RequiredDeps: ElvUI
 ## LoadOnDemand: 1