revert f005fde and fixed font flags

+ bump version
bkader · Mar 23, 2024 · 5653a24 · 5653a24
1 parent 4c1beeb
commit 5653a24
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 55 deletions.
diff --git a/Skada/Core/Display/Bar.lua b/Skada/Core/Display/Bar.lua
@@ -39,11 +39,11 @@ Skada:RegisterDisplay("Bar Display", "mod_bar_desc", function(L, P, G, _, _, O)
 	if not FONT_FLAGS then
 		FONT_FLAGS = {
 			[""] = L["None"],
-			["OUTLINE"] = L["Outline"],
-			["THICK"] = L["Thick"],
-			["THICKOUTLINE"] = L["Thick outline"],
 			["MONOCHROME"] = L["Monochrome"],
-			["OUTLINEMONOCHROME"] = L["Outlined monochrome"]
+			["OUTLINE"] = L["Outline"],
+			["THICKOUTLINE"] = L["Thick Outline"],
+			["OUTLINEMONOCHROME"] = L["Outline & Monochrome"],
+			["THICKOUTLINEMONOCHROME"] = L["Thick Outline & Monochrome"]
 		}
 		Skada.fontFlags = FONT_FLAGS
 	end
@@ -164,6 +164,9 @@ Skada:RegisterDisplay("Bar Display", "mod_bar_desc", function(L, P, G, _, _, O)
 			-- fix old oriantation & buttons texture
 			p.barorientation = max(LEFT_TO_RIGHT, min(RIGHT_TO_LEFT, p.barorientation or LEFT_TO_RIGHT))
 			p.title.toolbar = max(1, min(2, p.title.toolbar or 2))
+			p.barfontflags = p.barfontflags == "THICK" and "" or p.barfontflags
+			p.numfontflags = p.numfontflags == "THICK" and "" or p.numfontflags
+			p.title.fontflags = p.title.fontflags == "THICK" and "" or p.title.fontflags
 
 			if not bargroup then
 				bargroup = mod:NewBarGroup(

diff --git a/Skada/Core/Display/Broker.lua b/Skada/Core/Display/Broker.lua
@@ -19,11 +19,11 @@ Skada:RegisterDisplay("Data Text", "mod_broker_desc", function(L, P)
 	if not FONT_FLAGS then
 		FONT_FLAGS = {
 			[""] = L["None"],
-			["OUTLINE"] = L["Outline"],
-			["THICK"] = L["Thick"],
-			["THICKOUTLINE"] = L["Thick outline"],
 			["MONOCHROME"] = L["Monochrome"],
-			["OUTLINEMONOCHROME"] = L["Outlined monochrome"]
+			["OUTLINE"] = L["Outline"],
+			["THICKOUTLINE"] = L["Thick Outline"],
+			["OUTLINEMONOCHROME"] = L["Outline & Monochrome"],
+			["THICKOUTLINEMONOCHROME"] = L["Thick Outline & Monochrome"]
 		}
 		Skada.fontFlags = FONT_FLAGS
 	end
@@ -132,7 +132,7 @@ Skada:RegisterDisplay("Data Text", "mod_broker_desc", function(L, P)
 			frame:SetWidth(p.width or 200)
 			frame:SetPoint("CENTER", 0, 0)
 
-			local title = frame:CreateFontString("frameTitle", 6)
+			local title = frame:CreateFontString("frameTitle", "OVERLAY")
 			title:SetPoint("CENTER", 0, 0)
 			frame.title = title
 

diff --git a/Skada/Core/Display/Inline.lua b/Skada/Core/Display/Inline.lua
@@ -26,11 +26,11 @@ Skada:RegisterDisplay("Inline Bar Display", "mod_inline_desc", function(L)
 	if not FONT_FLAGS then
 		FONT_FLAGS = {
 			[""] = L["None"],
-			["OUTLINE"] = L["Outline"],
-			["THICK"] = L["Thick"],
-			["THICKOUTLINE"] = L["Thick outline"],
 			["MONOCHROME"] = L["Monochrome"],
-			["OUTLINEMONOCHROME"] = L["Outlined monochrome"]
+			["OUTLINE"] = L["Outline"],
+			["THICKOUTLINE"] = L["Thick Outline"],
+			["OUTLINEMONOCHROME"] = L["Outline & Monochrome"],
+			["THICKOUTLINEMONOCHROME"] = L["Thick Outline & Monochrome"]
 		}
 		Skada.fontFlags = FONT_FLAGS
 	end
@@ -175,7 +175,7 @@ Skada:RegisterDisplay("Inline Bar Display", "mod_inline_desc", function(L)
 		local titlebg = CreateFrame("Frame", "$parentTitleBackground", frame)
 		titlebg.win = window
 
-		local title = frame:CreateFontString("frameTitle", 6)
+		local title = frame:CreateFontString("frameTitle", "OVERLAY")
 		title:SetTextColor(self:GetFontColor(p))
 		title:SetFont(self:GetFont(p))
 		title:SetText(window.metadata.title or folder)

diff --git a/Skada/Core/Display/Legacy.lua b/Skada/Core/Display/Legacy.lua
@@ -1065,7 +1065,7 @@ Skada:RegisterDisplay("Legacy Bar Display", "mod_bar_desc", function(L, P)
 		end
 
 		function barPrototype:UpdateColor()
-			if not self.colors then return end
+			if not self.colors or not self.colors[1] then return end
 			self.texture:SetVertexColor(self.colors[1], self.colors[2], self.colors[3], self.colors[4] or 1)
 		end
 

diff --git a/Skada/Core/Options.lua b/Skada/Core/Options.lua
@@ -20,10 +20,10 @@ Skada.windowdefaults = {
 	barspacing = 0,
 	bartexture = "BantoBar",
 	barfont = "Accidental Presidency",
-	barfontflags = "THICK",
+	barfontflags = "",
 	barfontsize = 13,
 	numfont = "Accidental Presidency",
-	numfontflags = "THICK",
+	numfontflags = "",
 	numfontsize = 13,
 	barheight = 18,
 	barwidth = 240,
@@ -43,7 +43,7 @@ Skada.windowdefaults = {
 		height = 20,
 		font = "Accidental Presidency",
 		fontsize = 13,
-		fontflags = "THICK",
+		fontflags = "",
 		color = {r = 0.15, g = 0.15, b = 0.15, a = 1},
 		texture = "Armory",
 		textcolor = {r = 0.9, g = 0.9, b = 0.9, a = 1},

diff --git a/Skada/Libs/SpecializedLibBars-1.0/SpecializedLibBars-1.0.lua b/Skada/Libs/SpecializedLibBars-1.0/SpecializedLibBars-1.0.lua
@@ -4,7 +4,7 @@
 -- in the unlikely event they end up being usable outside of Skada.
 -- Renaming the library (MAJOR) might break few things.
 
-local MAJOR, MINOR = "SpecializedLibBars-1.0", 90028
+local MAJOR, MINOR = "SpecializedLibBars-1.0", 90029
 local lib, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 if not lib then return end -- No Upgrade needed.
 local folder = ...
@@ -1849,14 +1849,10 @@ end
 -- changes label and timer fonts
 function barPrototype:SetFont(font, size, outline, numFont, numSize, numOutline)
 	local f, s, o = self.label:GetFont()
-	outline = outline or o
-	self.label:SetFont(font or f, size or s, outline)
-	self.label:SetShadowColor(0, 0, 0, outline == "" and 0 or 1)
+	self.label:SetFont(font or f, size or s, outline or o)
 
 	f, s, o = self.timerLabel:GetFont()
-	numOutline = numOutline or o
-	self.timerLabel:SetFont(numFont or f, numSize or s, numOutline)
-	self.timerLabel:SetShadowColor(0, 0, 0, numOutline == "" and 0 or 1)
+	self.timerLabel:SetFont(numFont or f, numSize or s, numOutline or o)
 end
 
 -- changes bar icon texture

diff --git a/Skada/Locales/deDE.lua b/Skada/Locales/deDE.lua
@@ -170,10 +170,10 @@ L["The font size of %s."] = "Die Schriftgr\195\182\195\159e von %s."
 L["Font Outline"] = "Schriftumriss"
 L["Sets the font outline."] = "Legt den Schriftumriss fest."
 L["Outline"] = "Umrandung"
-L["Thick"] = "Dicke"
-L["Thick outline"] = "Dicke Umrandung"
 L["Monochrome"] = "Monochrom"
-L["Outlined monochrome"] = "Monochrome Umrandung"
+L["Thick Outline"] = "Dicker Umrandung"
+L["Outline & Monochrome"] = "Umrandung und Monochrom"
+L["Thick Outline & Monochrome"] = "Dicker Umrandung und Monochrom"
 L["Bar Texture"] = "Leistentextur"
 L["The texture used by all bars."] = "Textur der Leisten."
 L["Spacing"] = "Abstand"

diff --git a/Skada/Locales/enUS.lua b/Skada/Locales/enUS.lua
@@ -202,10 +202,10 @@ L["The font size of %s."] = true
 L["Font Outline"] = true
 L["Sets the font outline."] = true
 L["Outline"] = true
-L["Thick"] = true
-L["Thick outline"] = true
 L["Monochrome"] = true
-L["Outlined monochrome"] = true
+L["Thick Outline"] = true
+L["Outline & Monochrome"] = true
+L["Thick Outline & Monochrome"] = true
 L["Bar Texture"] = true
 L["The texture used by all bars."] = true
 L["Spacing"] = true

diff --git a/Skada/Locales/esMX.lua b/Skada/Locales/esMX.lua
@@ -173,10 +173,10 @@ L["The font size of %s."] = "El tama\195\177o de fuente de %s."
 L["Font Outline"] = "Contorno de la fuente"
 L["Sets the font outline."] = "Establece el contorno de la fuente."
 L["Outline"] = "Contorno"
-L["Thick"] = "Grueso"
-L["Thick outline"] = "Contorno grueso"
 L["Monochrome"] = "Monocromo"
-L["Outlined monochrome"] = "Contorno monocromo"
+L["Thick Outline"] = "Contorno grueso"
+L["Outline & Monochrome"] = "Contorno y Monocromo"
+L["Thick Outline & Monochrome"] = "Contorno grueso y Monocromo"
 L["Bar Texture"] = "Textura de la barra"
 L["The texture used by all bars."] = "La textura usada por todas las barras"
 L["Spacing"] = "Espaciado"

diff --git a/Skada/Locales/frFR.lua b/Skada/Locales/frFR.lua
@@ -171,10 +171,10 @@ L["The font size of %s."] = "La taille de police \1242 %s."
 L["Font Outline"] = "Contour de la police"
 L["Sets the font outline."] = "D\195\169finit le type de contour de la police."
 L["Outline"] = "Contour"
-L["Thick"] = "\195\137pais"
-L["Thick outline"] = "Contour \195\169pais"
 L["Monochrome"] = "Monochrome"
-L["Outlined monochrome"] = "Contour monochrome"
+L["Thick Outline"] = "Contour \195\169pais"
+L["Outline & Monochrome"] = "Contour et monochrome"
+L["Thick Outline & Monochrome"] = "Contour \195\169pais et monochrome"
 L["Bar Texture"] = "Texture des barres"
 L["The texture used by all bars."] = "La texture utilis\195\169e par toutes les barres."
 L["Spacing"] = "Espacement"

diff --git a/Skada/Locales/koKR.lua b/Skada/Locales/koKR.lua
@@ -169,11 +169,11 @@ L["Font Size"] = "글꼴 크기"
 L["The font size of %s."] = "%s의 글꼴 크기입니다."
 L["Font Outline"] = "글꼴 그림자"
 L["Sets the font outline."] = "글꼴 윤곽을 설정합니다."
-L["Outline"] = "외곽선"
-L["Thick"] = "두꺼운"
-L["Thick outline"] = "두꺼운 외곽선"
-L["Monochrome"] = "모노크롬"
-L["Outlined monochrome"] = "모노크롬 외곽선"
+L["Outline"] = "윤곽"
+L["Monochrome"] = "단색"
+L["Thick Outline"] = "두꺼운 윤곽"
+L["Outline & Monochrome"] = "윤곽 및 단색"
+L["Thick Outline & Monochrome"] = "두꺼운 윤곽 및 단색"
 L["Bar Texture"] = "바 텍스쳐"
 L["The texture used by all bars."] = "모든 바에 사용할 바 텍스쳐입니다."
 L["Spacing"] = "간격"

diff --git a/Skada/Locales/ruRU.lua b/Skada/Locales/ruRU.lua
@@ -170,11 +170,11 @@ L["Font Size"] = "Размер шрифта"
 L["The font size of %s"] = "Размер шрифта для %s"
 L["Font Outline"] = "Контур шрифта"
 L["Sets the font outline."] = "Устанавливает контур шрифта."
-L["Outline"] = "Окантовка"
-L["Thick"] = "Толстая"
-L["Thick outline"] = "Толстая окантовка"
-L["Monochrome"] = "Черно-белое"
-L["Outlined monochrome"] = "Черно-белое с окантовкой"
+L["Outline"] = "Контур"
+L["Monochrome"] = "Монохром"
+L["Thick Outline"] = "Толстый контур"
+L["Outline & Monochrome"] = "Контур и монохром"
+L["Thick Outline & Monochrome"] = "Толстый контур и монохром"
 L["Bar Texture"] = "Текстура полос"
 L["The texture used by all bars."] = "Текстура, используемая всеми полосами."
 L["Spacing"] = "Интервал"

diff --git a/Skada/Locales/zhCN.lua b/Skada/Locales/zhCN.lua
@@ -171,10 +171,10 @@ L["The font size of %s."] = "%s 的字体大小。"
 L["Font Outline"] = "字体轮廓"
 L["Sets the font outline."] = "设置字体轮廓。"
 L["Outline"] = "轮廓"
-L["Thick"] = "粗"
-L["Thick outline"] = "粗轮廓"
 L["Monochrome"] = "单色"
-L["Outlined monochrome"] = "轮廓单色"
+L["Thick Outline"] = "粗轮廓"
+L["Outline & Monochrome"] = "轮廓和单色"
+L["Thick Outline & Monochrome"] = "粗轮廓和单色"
 L["Bar Texture"] = "统计条材质"
 L["The texture used by all bars."] = "全部统计条所使用的材质。"
 L["Spacing"] = "间距"

diff --git a/Skada/Locales/zhTW.lua b/Skada/Locales/zhTW.lua
@@ -170,10 +170,10 @@ L["The font size of %s."] = "%s 的字體大小。"
 L["Font Outline"] = "字体轮廓"
 L["Sets the font outline."] = "設置字體輪廓。"
 L["Outline"] = "輪廓"
-L["Thick"] = "粗"
-L["Thick outline"] = "粗體"
 L["Monochrome"] = "單色"
-L["Outlined monochrome"] = "單色字體"
+L["Thick Outline"] = "厚輪廓"
+L["Outline & Monochrome"] = "輪廓和單色"
+L["Thick Outline & Monochrome"] = "厚輪廓和單色"
 L["Bar Texture"] = "計量條的材質"
 L["The texture used by all bars."] = "所有計量條使用這個材質。"
 L["Spacing"] = "間距"

diff --git a/Skada/Skada.toc b/Skada/Skada.toc
@@ -15,8 +15,8 @@
 ## SavedVariablesPerCharacter: SkadaCharDB
 ## DefaultState: enabled
 ## Author: Kader (|cff808080bkader#5341|r)
-## Version: 1.8.86
-## X-Date: 2024-03-22 @ 23:08 |cff808080UTC|r
+## Version: 1.8.87
+## X-Date: 2024-03-23 @ 11:22 |cff808080UTC|r
 ## X-Credits: Zarnivoop
 ## X-Curse-Project-ID: 623633
 ## X-Category: Combat