Merge branch 'dev'

ls- · May 15, 2023 · 962e5b8 · 962e5b8
2 parents c0c42f5 + a5984c0
commit 962e5b8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## Version 100100.04
+
+### Blizzard
+
+- Readded gems to the character panel. Finally...
+
 ## Version 100100.03
 
 ### Action Bars

diff --git a/ls_UI/core/changelog.lua b/ls_UI/core/changelog.lua
@@ -6,10 +6,7 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-### Action Bars
+### Blizzard
 
-- Removed main bar specific "Scale" option.
-- Added "Scale" options to all action bars.
-- Added an option to change the number of main bar buttons.
-- Fixed an issue where the xp bar would sometimes disappear.
+- Readded gems to the character panel. Finally...
 ]]
diff --git a/ls_UI/core/utils.lua b/ls_UI/core/utils.lua
@@ -778,7 +778,8 @@ end
 
 do
 	local ENCHANT_PATTERN = ENCHANTED_TOOLTIP_LINE:gsub("%%s", "(.+)")
-	local GEM_TEMPLATE = "|TInterface\\ItemSocketingFrame\\UI-EmptySocket-%s:0:0:0:0:64:64:4:60:4:60|t "
+	local SOCKET_TEMPLATE = "|TInterface\\ItemSocketingFrame\\UI-EmptySocket-%s:0:0:0:0:64:64:4:60:4:60|t "
+	local GEM_TEMPLATE = "|T%s:0:0:0:0:64:64:4:60:4:60|t "
 
 	local itemCache = {}
 
@@ -797,8 +798,8 @@ do
 		for _, line in next, data.lines do
 			if line.enchantID then
 				enchant = line.leftText:match(ENCHANT_PATTERN)
-			elseif line.socketType then
-				gems[idx] = GEM_TEMPLATE:format(line.socketType)
+			elseif line.gemIcon or line.socketType then
+				gems[idx] = line.gemIcon and GEM_TEMPLATE:format(line.gemIcon) or SOCKET_TEMPLATE:format(line.socketType)
 				idx = idx + 1
 			end
 		end

diff --git a/ls_UI/ls_UI.toc b/ls_UI/ls_UI.toc
@@ -1,6 +1,6 @@
 ## Interface: 100100
 ## Author: lightspark
-## Version: 100100.03
+## Version: 100100.04
 ## Title: LS: |cff1a9fc0UI|r
 ## Notes: Yet another UI, but this one is a bit special...
 ## IconTexture: Interface\AddOns\ls_UI\assets\logo-64

diff --git a/ls_UI_Options/bars/bar.lua b/ls_UI_Options/bars/bar.lua
@@ -416,6 +416,7 @@ function CONFIG:CreateBarOptions(order, barID, name)
 		temp.args.reset.disabled = isPetBattleBarDisabledOrRestricted
 		temp.args.visible.disabled = isPetBattleBarDisabledOrRestricted
 		temp.args.grid = nil
+		temp.args.scale.disabled = isModuleDisabledOrRestricted
 		temp.args.num.max = 6
 		temp.args.num.disabled = isPetBattleBarDisabledOrRestricted
 		temp.args.per_row.max = 6