From 013dc81494c31f36bcacb78a861f6aa0727533fc Mon Sep 17 00:00:00 2001 From: dbulatovicx32 Date: Sun, 25 May 2025 14:14:02 +0200 Subject: [PATCH] castbar: add options for x and y text offsets --- api/config.lua | 12 ++++++++++++ modules/castbar.lua | 8 ++++---- modules/gui.lua | 30 +++++++++++++++++++++--------- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/api/config.lua b/api/config.lua index 06e29425..6cf26827 100644 --- a/api/config.lua +++ b/api/config.lua @@ -636,24 +636,36 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("castbar", "player", "showicon", "0") pfUI:UpdateConfig("castbar", "player", "showname", "1") pfUI:UpdateConfig("castbar", "player", "showtimer", "1") + pfUI:UpdateConfig("castbar", "player", "txtleftoffx", "0") + pfUI:UpdateConfig("castbar", "player", "txtleftoffy", "0") pfUI:UpdateConfig("castbar", "player", "showlag", "0") pfUI:UpdateConfig("castbar", "player", "showrank", "0") + pfUI:UpdateConfig("castbar", "player", "txtrightoffx", "0") + pfUI:UpdateConfig("castbar", "player", "txtrightoffy", "0") pfUI:UpdateConfig("castbar", "target", "hide_pfui", "0") pfUI:UpdateConfig("castbar", "target", "width", "-1") pfUI:UpdateConfig("castbar", "target", "height", "-1") pfUI:UpdateConfig("castbar", "target", "showicon", "0") pfUI:UpdateConfig("castbar", "target", "showname", "1") pfUI:UpdateConfig("castbar", "target", "showtimer", "1") + pfUI:UpdateConfig("castbar", "target", "txtleftoffx", "0") + pfUI:UpdateConfig("castbar", "target", "txtleftoffy", "0") pfUI:UpdateConfig("castbar", "target", "showlag", "0") pfUI:UpdateConfig("castbar", "target", "showrank", "0") + pfUI:UpdateConfig("castbar", "target", "txtrightoffx", "0") + pfUI:UpdateConfig("castbar", "target", "txtrightoffy", "0") pfUI:UpdateConfig("castbar", "focus", "hide_pfui", "0") pfUI:UpdateConfig("castbar", "focus", "width", "-1") pfUI:UpdateConfig("castbar", "focus", "height", "-1") pfUI:UpdateConfig("castbar", "focus", "showicon", "0") pfUI:UpdateConfig("castbar", "focus", "showname", "1") pfUI:UpdateConfig("castbar", "focus", "showtimer", "1") + pfUI:UpdateConfig("castbar", "focus", "txtleftoffx", "0") + pfUI:UpdateConfig("castbar", "focus", "txtleftoffy", "0") pfUI:UpdateConfig("castbar", "focus", "showlag", "0") pfUI:UpdateConfig("castbar", "focus", "showrank", "0") + pfUI:UpdateConfig("castbar", "focus", "txtrightoffx", "0") + pfUI:UpdateConfig("castbar", "focus", "txtrightoffy", "0") pfUI:UpdateConfig("castbar", nil, "use_unitfonts", "0") pfUI:UpdateConfig("tooltip", nil, "position", "chat") diff --git a/modules/castbar.lua b/modules/castbar.lua index 51de204c..9607725b 100644 --- a/modules/castbar.lua +++ b/modules/castbar.lua @@ -40,8 +40,8 @@ pfUI:RegisterModule("castbar", "vanilla:tbc", function () -- text left cb.bar.left = cb.bar:CreateFontString("Status", "DIALOG", "GameFontNormal") cb.bar.left:ClearAllPoints() - cb.bar.left:SetPoint("TOPLEFT", cb.bar, "TOPLEFT", 3, 0) - cb.bar.left:SetPoint("BOTTOMRIGHT", cb.bar, "BOTTOMRIGHT", -3, 0) + cb.bar.left:SetPoint("TOPLEFT", cb.bar, "TOPLEFT", 3 + C.castbar[unitstr].txtleftoffx, C.castbar[unitstr].txtleftoffy) + cb.bar.left:SetPoint("BOTTOMRIGHT", cb.bar, "BOTTOMRIGHT", -3 + C.castbar[unitstr].txtleftoffx, C.castbar[unitstr].txtleftoffy) cb.bar.left:SetNonSpaceWrap(false) cb.bar.left:SetFontObject(GameFontWhite) cb.bar.left:SetTextColor(1,1,1,1) @@ -51,8 +51,8 @@ pfUI:RegisterModule("castbar", "vanilla:tbc", function () -- text right cb.bar.right = cb.bar:CreateFontString("Status", "DIALOG", "GameFontNormal") cb.bar.right:ClearAllPoints() - cb.bar.right:SetPoint("TOPLEFT", cb.bar, "TOPLEFT", 3, 0) - cb.bar.right:SetPoint("BOTTOMRIGHT", cb.bar, "BOTTOMRIGHT", -3, 0) + cb.bar.right:SetPoint("TOPLEFT", cb.bar, "TOPLEFT", 3 + C.castbar[unitstr].txtrightoffx, C.castbar[unitstr].txtrightoffy) + cb.bar.right:SetPoint("BOTTOMRIGHT", cb.bar, "BOTTOMRIGHT", -3 + C.castbar[unitstr].txtrightoffx, C.castbar[unitstr].txtrightoffy) cb.bar.right:SetNonSpaceWrap(false) cb.bar.right:SetFontObject(GameFontWhite) cb.bar.right:SetTextColor(1,1,1,1) diff --git a/modules/gui.lua b/modules/gui.lua index a0780040..7ab3262d 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -2178,34 +2178,46 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () CreateConfig(nil, T["Disable Blizzard Castbar"], C.castbar.player, "hide_blizz", "checkbox") CreateConfig(nil, T["Player Castbar"], nil, nil, "header") + CreateConfig(nil, T["Disable Player Castbar"], C.castbar.player, "hide_pfui", "checkbox") + CreateConfig(nil, T["Castbar Width"], C.castbar.player, "width") + CreateConfig(nil, T["Castbar Height"], C.castbar.player, "height") CreateConfig(nil, T["Show Spell Icon"], C.castbar.player, "showicon", "checkbox") CreateConfig(nil, T["Show Spell Name"], C.castbar.player, "showname", "checkbox") CreateConfig(nil, T["Show Timer"], C.castbar.player, "showtimer", "checkbox") + CreateConfig(nil, T["Left Text X Offset"], C.castbar.player, "txtleftoffx") + CreateConfig(nil, T["Left Text Y Offset"], C.castbar.player, "txtleftoffy") CreateConfig(nil, T["Show Lag"], C.castbar.player, "showlag", "checkbox") CreateConfig(nil, T["Show Rank"], C.castbar.player, "showrank", "checkbox") - CreateConfig(nil, T["Castbar Width"], C.castbar.player, "width") - CreateConfig(nil, T["Castbar Height"], C.castbar.player, "height") - CreateConfig(nil, T["Disable Player Castbar"], C.castbar.player, "hide_pfui", "checkbox") + CreateConfig(nil, T["Right Text X Offset"], C.castbar.player, "txtrightoffx") + CreateConfig(nil, T["Right Text Y Offset"], C.castbar.player, "txtrightoffy") CreateConfig(nil, T["Target Castbar"], nil, nil, "header") + CreateConfig(nil, T["Disable Target Castbar"], C.castbar.target, "hide_pfui", "checkbox") + CreateConfig(nil, T["Castbar Width"], C.castbar.target, "width") + CreateConfig(nil, T["Castbar Height"], C.castbar.target, "height") CreateConfig(nil, T["Show Spell Icon"], C.castbar.target, "showicon", "checkbox") CreateConfig(nil, T["Show Spell Name"], C.castbar.target, "showname", "checkbox") CreateConfig(nil, T["Show Timer"], C.castbar.target, "showtimer", "checkbox") + CreateConfig(nil, T["Left Text X Offset"], C.castbar.target, "txtleftoffx") + CreateConfig(nil, T["Left Text Y Offset"], C.castbar.target, "txtleftoffy") CreateConfig(nil, T["Show Lag"], C.castbar.target, "showlag", "checkbox") CreateConfig(nil, T["Show Rank"], C.castbar.target, "showrank", "checkbox") - CreateConfig(nil, T["Castbar Width"], C.castbar.target, "width") - CreateConfig(nil, T["Castbar Height"], C.castbar.target, "height") - CreateConfig(nil, T["Disable Target Castbar"], C.castbar.target, "hide_pfui", "checkbox") + CreateConfig(nil, T["Right Text X Offset"], C.castbar.target, "txtrightoffx") + CreateConfig(nil, T["Right Text Y Offset"], C.castbar.target, "txtrightoffy") CreateConfig(nil, T["Focus Castbar"], nil, nil, "header") + CreateConfig(nil, T["Disable Focus Castbar"], C.castbar.focus, "hide_pfui", "checkbox") + CreateConfig(nil, T["Castbar Width"], C.castbar.focus, "width") + CreateConfig(nil, T["Castbar Height"], C.castbar.focus, "height") CreateConfig(nil, T["Show Spell Icon"], C.castbar.focus, "showicon", "checkbox") CreateConfig(nil, T["Show Spell Name"], C.castbar.focus, "showname", "checkbox") CreateConfig(nil, T["Show Timer"], C.castbar.focus, "showtimer", "checkbox") + CreateConfig(nil, T["Left Text X Offset"], C.castbar.focus, "txtleftoffx") + CreateConfig(nil, T["Left Text Y Offset"], C.castbar.focus, "txtleftoffy") CreateConfig(nil, T["Show Lag"], C.castbar.focus, "showlag", "checkbox") CreateConfig(nil, T["Show Rank"], C.castbar.focus, "showrank", "checkbox") - CreateConfig(nil, T["Castbar Width"], C.castbar.focus, "width") - CreateConfig(nil, T["Castbar Height"], C.castbar.focus, "height") - CreateConfig(nil, T["Disable Focus Castbar"], C.castbar.focus, "hide_pfui", "checkbox") + CreateConfig(nil, T["Right Text X Offset"], C.castbar.focus, "txtrightoffx") + CreateConfig(nil, T["Right Text Y Offset"], C.castbar.focus, "txtrightoffy") end) CreateGUIEntry(T["Chat"], nil, function()