From 09498bc6cbd0da859fbb9c6335fd7bdfeb9b5e4b Mon Sep 17 00:00:00 2001 From: DennisWG Date: Tue, 28 Jul 2020 16:57:45 +0200 Subject: [PATCH] xpbar: add option to not overlap the xpbars --- api/config.lua | 1 + env/translations_deDE.lua | 1 + env/translations_enUS.lua | 1 + env/translations_esES.lua | 1 + env/translations_frFR.lua | 1 + env/translations_koKR.lua | 1 + env/translations_ruRU.lua | 1 + env/translations_zhCN.lua | 1 + env/translations_zhTW.lua | 1 + modules/gui.lua | 1 + modules/xpbar.lua | 12 ++++++++++-- 11 files changed, 20 insertions(+), 2 deletions(-) diff --git a/api/config.lua b/api/config.lua index 5f5e5c1d..377665a9 100644 --- a/api/config.lua +++ b/api/config.lua @@ -545,6 +545,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("panel", "xp", "rep_mode", "VERTICAL") pfUI:UpdateConfig("panel", "xp", "rep_anchor", "pfChatRight") pfUI:UpdateConfig("panel", "xp", "rep_position", "LEFT") + pfUI:UpdateConfig("panel", "xp", "dont_overlap", "0") pfUI:UpdateConfig("castbar", "player", "hide_blizz", "1") pfUI:UpdateConfig("castbar", "player", "hide_pfui", "0") diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua index 0788f24a..da56bce9 100644 --- a/env/translations_deDE.lua +++ b/env/translations_deDE.lua @@ -643,6 +643,7 @@ pfUI_translation["deDE"] = { ["Standard Text Font Size"] = nil, ["Status"] = nil, ["Status Bar Texture"] = nil, + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = nil, ["Switch Pages On Meta Key Press"] = nil, ["Systeminfo"] = nil, diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua index 0f3c4564..3fe0b5c3 100644 --- a/env/translations_enUS.lua +++ b/env/translations_enUS.lua @@ -643,6 +643,7 @@ pfUI_translation["enUS"] = { ["Standard Text Font Size"] = nil, ["Status"] = nil, ["Status Bar Texture"] = nil, + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = nil, ["Switch Pages On Meta Key Press"] = nil, ["Systeminfo"] = nil, diff --git a/env/translations_esES.lua b/env/translations_esES.lua index fed4bd30..a13ad7bc 100644 --- a/env/translations_esES.lua +++ b/env/translations_esES.lua @@ -643,6 +643,7 @@ pfUI_translation["esES"] = { ["Standard Text Font Size"] = "Tamaño de la fuente de texto estándar", ["Status"] = "Estado", ["Status Bar Texture"] = "Textura de la barra de estado", + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = "Alternar páginas en el modo sigilo del druida", ["Switch Pages On Meta Key Press"] = "Cambiar página por presionar la tecla meta", ["Systeminfo"] = "Información del sistema", diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua index 5a6d287c..3398c784 100644 --- a/env/translations_frFR.lua +++ b/env/translations_frFR.lua @@ -643,6 +643,7 @@ pfUI_translation["frFR"] = { ["Standard Text Font Size"] = "Taille de la police standard du texte", ["Status"] = "Statut", ["Status Bar Texture"] = "Texture de la barre d'état", + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = "Changer de page sur le camouflage du Druide", ["Switch Pages On Meta Key Press"] = "Basculer les pages sur la touche Meta", ["Systeminfo"] = "Info Système", diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua index b01879b8..1b985a21 100644 --- a/env/translations_koKR.lua +++ b/env/translations_koKR.lua @@ -643,6 +643,7 @@ pfUI_translation["koKR"] = { ["Standard Text Font Size"] = "기본 텍스트 폰트크기", ["Status"] = "상태", ["Status Bar Texture"] = nil, + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = nil, ["Switch Pages On Meta Key Press"] = nil, ["Systeminfo"] = "시스템 정보", diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua index 4176dc56..72cb5784 100644 --- a/env/translations_ruRU.lua +++ b/env/translations_ruRU.lua @@ -643,6 +643,7 @@ pfUI_translation["ruRU"] = { ["Standard Text Font Size"] = "Размер шрифта стандартного текста", ["Status"] = "Статус", ["Status Bar Texture"] = "Текстура статус панели", + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = "Перекл страниц при невидимости друида", ["Switch Pages On Meta Key Press"] = "Перекл страниц по нажатию мета-клавиш (Alt, Shift, Ctrl)", ["Systeminfo"] = "Системная информация", diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua index a344e0ab..952ce62b 100644 --- a/env/translations_zhCN.lua +++ b/env/translations_zhCN.lua @@ -643,6 +643,7 @@ pfUI_translation["zhCN"] = { ["Standard Text Font Size"] = "标准字体字号", ["Status"] = "当前状态", ["Status Bar Texture"] = "状态条纹理材质", + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = nil, ["Switch Pages On Meta Key Press"] = "Ctrl/Alt/Shift 触发分页", ["Systeminfo"] = "系统信息", diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua index edf51779..75113cb1 100644 --- a/env/translations_zhTW.lua +++ b/env/translations_zhTW.lua @@ -643,6 +643,7 @@ pfUI_translation["zhTW"] = { ["Standard Text Font Size"] = "標準字體字型大小", ["Status"] = "當前狀態", ["Status Bar Texture"] = "狀態條紋理材質", + ["Don't overlap rested"] = nil, ["Switch Pages On Druid Stealth"] = nil, ["Switch Pages On Meta Key Press"] = nil, ["Systeminfo"] = "系統資訊", diff --git a/modules/gui.lua b/modules/gui.lua index 75eb9814..2ceef965 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -1980,6 +1980,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function () CreateConfig(U["xpbar"], T["Orientation"], C.panel.xp, "xp_mode", "dropdown", pfUI.gui.dropdowns.orientation) CreateConfig(U["xpbar"], T["Frame Anchor"], C.panel.xp, "xp_anchor", "dropdown", pfUI.gui.dropdowns.xpanchors) CreateConfig(U["xpbar"], T["Aligned Position"], C.panel.xp, "xp_position", "dropdown", pfUI.gui.dropdowns.xp_position) + CreateConfig(U["xpbar"], T["Don't overlap rested"], C.panel.xp, "dont_overlap", "checkbox") CreateConfig(nil, T["Colors"], nil, nil, "header") CreateConfig(U["xpbar"], T["Experience Color"], C.panel.xp, "xp_color", "color") diff --git a/modules/xpbar.lua b/modules/xpbar.lua index 6ffb93ce..5a6db437 100644 --- a/modules/xpbar.lua +++ b/modules/xpbar.lua @@ -199,6 +199,14 @@ end b.position = t == "XP" and C.panel.xp.xp_position or C.panel.xp.rep_position b.display = t == "XP" and C.panel.xp.xp_display or C.panel.xp.rep_display + local barStrata = "LOW" + local restedStrata = "MEDIUM" + + if C.panel.xp.dont_overlap == "1" then + barStrata = "MEDIUM" + restedStrata = "LOW" + end + if t == "XP" and C.panel.xp.xp_always == "1" then b.always = true elseif t == "REP" and C.panel.xp.rep_always == "1" then @@ -220,7 +228,7 @@ end b.bar:SetStatusBarTexture(pfUI.media["img:bar"]) b.bar:ClearAllPoints() b.bar:SetAllPoints(b) - b.bar:SetFrameStrata("LOW") + b.bar:SetFrameStrata(barStrata) local cr, cg, cb, ca = pfUI.api.GetStringColor(b.xp_color) b.bar:SetStatusBarColor(cr,cg,cb,ca) @@ -230,7 +238,7 @@ end b.restedbar:SetStatusBarTexture(pfUI.media["img:bar"]) b.restedbar:ClearAllPoints() b.restedbar:SetAllPoints(b) - b.restedbar:SetFrameStrata("MEDIUM") + b.restedbar:SetFrameStrata(restedStrata) local cr, cg, cb, ca = pfUI.api.GetStringColor(b.rest_color) b.restedbar:SetStatusBarColor(cr,cg,cb,ca) b.restedbar:SetOrientation(b.mode)