From 59e1ed3bbed9754ee619572512d217147649077d Mon Sep 17 00:00:00 2001 From: shagu Date: Wed, 7 Jun 2017 18:53:18 +0200 Subject: [PATCH] castbar: add option to use unit font --- api/config.lua | 2 ++ modules/castbar.lua | 11 +++++++---- modules/gui.lua | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/config.lua b/api/config.lua index 192f37dd..b6784feb 100644 --- a/api/config.lua +++ b/api/config.lua @@ -365,6 +365,8 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("castbar", "player", "hide_blizz", "1") pfUI:UpdateConfig("castbar", "player", "hide_pfui", "0") pfUI:UpdateConfig("castbar", "target", "hide_pfui", "0") + pfUI:UpdateConfig("castbar", nil, "use_unitfonts", "1") + pfUI:UpdateConfig("tooltip", nil, "position", "bottom") pfUI:UpdateConfig("tooltip", nil, "extguild", "1") pfUI:UpdateConfig("tooltip", nil, "alpha", "0.8") diff --git a/modules/castbar.lua b/modules/castbar.lua index 3e00b3c2..e4c6e353 100644 --- a/modules/castbar.lua +++ b/modules/castbar.lua @@ -1,5 +1,8 @@ pfUI:RegisterModule("castbar", function () + local font = C.castbar.use_unitfonts == "1" and pfUI.font_square or pfUI.font_default + local font_size = C.castbar.use_unitfonts == "1" and C.global.font_square_size or C.global.font_size + local default_border = C.appearance.border.default if C.appearance.border.unitframes ~= "-1" then default_border = C.appearance.border.unitframes @@ -49,7 +52,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.player.bar.left:SetNonSpaceWrap(false) pfUI.castbar.player.bar.left:SetFontObject(GameFontWhite) pfUI.castbar.player.bar.left:SetTextColor(1,1,1,1) - pfUI.castbar.player.bar.left:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE") + pfUI.castbar.player.bar.left:SetFont(font, font_size, "OUTLINE") pfUI.castbar.player.bar.left:SetText("left") pfUI.castbar.player.bar.left:SetJustifyH("left") @@ -61,7 +64,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.player.bar.right:SetNonSpaceWrap(false) pfUI.castbar.player.bar.right:SetFontObject(GameFontWhite) pfUI.castbar.player.bar.right:SetTextColor(1,1,1,1) - pfUI.castbar.player.bar.right:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE") + pfUI.castbar.player.bar.right:SetFont(font, font_size, "OUTLINE") pfUI.castbar.player.bar.right:SetText("right") pfUI.castbar.player.bar.right:SetJustifyH("right") @@ -364,7 +367,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target.bar.left:SetNonSpaceWrap(false) pfUI.castbar.target.bar.left:SetFontObject(GameFontWhite) pfUI.castbar.target.bar.left:SetTextColor(1,1,1,1) - pfUI.castbar.target.bar.left:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE") + pfUI.castbar.target.bar.left:SetFont(font, font_size, "OUTLINE") pfUI.castbar.target.bar.left:SetText("left") pfUI.castbar.target.bar.left:SetJustifyH("left") @@ -376,7 +379,7 @@ pfUI:RegisterModule("castbar", function () pfUI.castbar.target.bar.right:SetNonSpaceWrap(false) pfUI.castbar.target.bar.right:SetFontObject(GameFontWhite) pfUI.castbar.target.bar.right:SetTextColor(1,1,1,1) - pfUI.castbar.target.bar.right:SetFont(pfUI.font_default, C.global.font_size, "OUTLINE") + pfUI.castbar.target.bar.right:SetFont(font, font_size, "OUTLINE") pfUI.castbar.target.bar.right:SetText("right") pfUI.castbar.target.bar.right:SetJustifyH("right") diff --git a/modules/gui.lua b/modules/gui.lua index e087cca9..1dc56a56 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -1212,6 +1212,7 @@ pfUI:RegisterModule("gui", function () -- castbar pfUI.gui.castbar = pfUI.gui:CreateConfigTab("Castbar") + pfUI.gui:CreateConfig(pfUI.gui.castbar, "Use Unit Fonts", C.castbar, "use_unitfonts", "checkbox") pfUI.gui:CreateConfig(pfUI.gui.castbar, "Casting Color", C.appearance.castbar, "castbarcolor", "color") pfUI.gui:CreateConfig(pfUI.gui.castbar, "Channeling Color", C.appearance.castbar, "channelcolor", "color") pfUI.gui:CreateConfig(pfUI.gui.castbar, "Disable Blizzard Castbar", C.castbar.player, "hide_blizz", "checkbox")