Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Merge remote-tracking branch 'fork/master'

Browse Source
This commit is contained in:
andrew6180
2024-06-06 23:04:05 -07:00
parent 79a41337a3 234bbf458c
commit 7c0725393f
8 changed files with 168 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/fw.lua
+2 -1
View File
@@ -1,6 +1,6 @@
local dversion = 537
local dversion = 538
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary(major, minor)
@@ -2574,6 +2574,7 @@ end
--DF.font_templates ["OPTIONS_FONT_TEMPLATE"] = {color = "yellow", size = 12, font = "Accidental Presidency"}
DF.font_templates["ORANGE_FONT_TEMPLATE"] = {color = "orange", size = 10, font = DF:GetBestFontForLanguage()}
DF.font_templates["OPTIONS_FONT_TEMPLATE"] = {color = "yellow", size = 9.6, font = DF:GetBestFontForLanguage()}
DF.font_templates["SMALL_SILVER"] = {color = "silver", size = 9, font = DF:GetBestFontForLanguage()}
--dropdowns
DF.dropdown_templates = DF.dropdown_templates or {}
Libs/DF/label.lua
+5
View File
@@ -408,6 +408,11 @@ function detailsFramework:NewLabel(parent, container, name, member, text, font,
--if template has been passed as the third parameter
if (size and type(size) == "table") then
labelObject:SetTemplate(size)
--check if a template was passed as the 3rd argument
elseif (size and type(size) == "string") then
local template = detailsFramework:ParseTemplate(labelObject.type, size)
labelObject:SetTemplate(template)
end
return labelObject