From a01329785e9cca52f7e43be278b50b4dbee9ad69 Mon Sep 17 00:00:00 2001 From: Eric Mauser Date: Mon, 16 May 2016 19:57:45 +0200 Subject: [PATCH] option for portrait on unitframes --- modules/gui.lua | 1 + modules/player.lua | 24 +++++++++++++----------- modules/target.lua | 26 ++++++++++++++------------ modules/targettarget.lua | 26 ++++++++++++++------------ pfUI.lua | 1 + 5 files changed, 43 insertions(+), 35 deletions(-) diff --git a/modules/gui.lua b/modules/gui.lua index c884c9af..9e5afc72 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -178,6 +178,7 @@ pfUI:RegisterModule("gui", function () pfUI.gui.uf.title:SetText("UnitFrame Settings") pfUI.gui.CreateConfig(pfUI.gui.uf, "Animation speed", pfUI_config.unitframes, "animation_speed") + pfUI.gui.CreateConfig(pfUI.gui.uf, "Show portrait", pfUI_config.unitframes, "portrait") pfUI.gui.CreateConfig(pfUI.gui.uf, "Buff size", pfUI_config.unitframes, "buff_size") pfUI.gui.CreateConfig(pfUI.gui.uf, "Debuff size", pfUI_config.unitframes, "debuff_size") pfUI.gui.CreateConfig(pfUI.gui.uf, "Layout", pfUI_config.unitframes, "layout") diff --git a/modules/player.lua b/modules/player.lua index 633eb750..b4e5b6ef 100644 --- a/modules/player.lua +++ b/modules/player.lua @@ -117,18 +117,20 @@ pfUI:RegisterModule("player", function () pfUI.uf.player.hp.bar:SetMinMaxValues(0, 100) - pfUI.uf.player.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.player.hp.bar) - pfUI.uf.player.hp.bar.portrait:SetAllPoints(pfUI.uf.player.hp.bar) - pfUI.uf.player.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") - pfUI.uf.player.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") - pfUI.uf.player.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") - pfUI.uf.player.hp.bar.portrait:SetScript("OnEvent", function() this:Update() end) - pfUI.uf.player.hp.bar.portrait:SetScript("OnShow", function() this:Update() end) + if pfUI_config.unitframes.portrait == "1" then + pfUI.uf.player.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.player.hp.bar) + pfUI.uf.player.hp.bar.portrait:SetAllPoints(pfUI.uf.player.hp.bar) + pfUI.uf.player.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") + pfUI.uf.player.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") + pfUI.uf.player.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") + pfUI.uf.player.hp.bar.portrait:SetScript("OnEvent", function() this:Update() end) + pfUI.uf.player.hp.bar.portrait:SetScript("OnShow", function() this:Update() end) - function pfUI.uf.player.hp.bar.portrait.Update() - pfUI.uf.player.hp.bar.portrait:SetUnit("player"); - pfUI.uf.player.hp.bar.portrait:SetCamera(0) - pfUI.uf.player.hp.bar.portrait:SetAlpha(0.10) + function pfUI.uf.player.hp.bar.portrait.Update() + pfUI.uf.player.hp.bar.portrait:SetUnit("player"); + pfUI.uf.player.hp.bar.portrait:SetCamera(0) + pfUI.uf.player.hp.bar.portrait:SetAlpha(0.10) + end end pfUI.uf.player.power = CreateFrame("Frame",nil, pfUI.uf.player) diff --git a/modules/target.lua b/modules/target.lua index 8250952f..2379d3d1 100644 --- a/modules/target.lua +++ b/modules/target.lua @@ -165,20 +165,22 @@ pfUI:RegisterModule("target", function () pfUI.uf.target.hp.bar:SetMinMaxValues(0, 100) pfUI.uf.target.hp.bar:SetValue(100) - pfUI.uf.target.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.target.hp.bar) - pfUI.uf.target.hp.bar.portrait:SetAllPoints(pfUI.uf.target.hp.bar) - pfUI.uf.target.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") - pfUI.uf.target.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") - pfUI.uf.target.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") - pfUI.uf.target.hp.bar.portrait:RegisterEvent("PLAYER_TARGET_CHANGED") + if pfUI_config.unitframes.portrait == "1" then + pfUI.uf.target.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.target.hp.bar) + pfUI.uf.target.hp.bar.portrait:SetAllPoints(pfUI.uf.target.hp.bar) + pfUI.uf.target.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") + pfUI.uf.target.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") + pfUI.uf.target.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") + pfUI.uf.target.hp.bar.portrait:RegisterEvent("PLAYER_TARGET_CHANGED") - pfUI.uf.target.hp.bar.portrait:SetScript("OnEvent", function() this:Update() end) - pfUI.uf.target.hp.bar.portrait:SetScript("OnShow", function() this:Update() end) + pfUI.uf.target.hp.bar.portrait:SetScript("OnEvent", function() this:Update() end) + pfUI.uf.target.hp.bar.portrait:SetScript("OnShow", function() this:Update() end) - function pfUI.uf.target.hp.bar.portrait.Update() - pfUI.uf.target.hp.bar.portrait:SetUnit("target"); - pfUI.uf.target.hp.bar.portrait:SetCamera(0) - pfUI.uf.target.hp.bar.portrait:SetAlpha(0.10) + function pfUI.uf.target.hp.bar.portrait.Update() + pfUI.uf.target.hp.bar.portrait:SetUnit("target"); + pfUI.uf.target.hp.bar.portrait:SetCamera(0) + pfUI.uf.target.hp.bar.portrait:SetAlpha(0.10) + end end pfUI.uf.target.power = CreateFrame("Frame",nil, pfUI.uf.target) diff --git a/modules/targettarget.lua b/modules/targettarget.lua index 207e995c..e10d1306 100644 --- a/modules/targettarget.lua +++ b/modules/targettarget.lua @@ -77,20 +77,22 @@ pfUI:RegisterModule("targettarget", function () pfUI.uf.targettarget.hp.bar:SetMinMaxValues(0, 100) pfUI.uf.targettarget.hp.bar:SetValue(100) - pfUI.uf.targettarget.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.targettarget.hp.bar) - pfUI.uf.targettarget.hp.bar.portrait:SetAllPoints(pfUI.uf.targettarget.hp.bar) - pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") - pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") - pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") - pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("PLAYER_TARGET_CHANGED") + if pfUI_config.unitframes.portrait == "1" then + pfUI.uf.targettarget.hp.bar.portrait = CreateFrame("PlayerModel",nil,pfUI.uf.targettarget.hp.bar) + pfUI.uf.targettarget.hp.bar.portrait:SetAllPoints(pfUI.uf.targettarget.hp.bar) + pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("UNIT_PORTRAIT_UPDATE") + pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("UNIT_MODEL_CHANGED") + pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("PLAYER_ENTERING_WORLD") + pfUI.uf.targettarget.hp.bar.portrait:RegisterEvent("PLAYER_TARGET_CHANGED") - pfUI.uf.targettarget.hp.bar.portrait:SetScript("OnEvent", function() this.Update() end) - pfUI.uf.targettarget.hp.bar.portrait:SetScript("OnShow", function() this.Update() end) + pfUI.uf.targettarget.hp.bar.portrait:SetScript("OnEvent", function() this.Update() end) + pfUI.uf.targettarget.hp.bar.portrait:SetScript("OnShow", function() this.Update() end) - function pfUI.uf.targettarget.hp.bar.portrait.Update() - pfUI.uf.targettarget.hp.bar.portrait:SetUnit("targettarget"); - pfUI.uf.targettarget.hp.bar.portrait:SetCamera(0) - pfUI.uf.targettarget.hp.bar.portrait:SetAlpha(0.10) + function pfUI.uf.targettarget.hp.bar.portrait.Update() + pfUI.uf.targettarget.hp.bar.portrait:SetUnit("targettarget"); + pfUI.uf.targettarget.hp.bar.portrait:SetCamera(0) + pfUI.uf.targettarget.hp.bar.portrait:SetAlpha(0.10) + end end pfUI.uf.targettarget.power = CreateFrame("Frame",nil, pfUI.uf.targettarget) diff --git a/pfUI.lua b/pfUI.lua index 6789cd94..38b810de 100644 --- a/pfUI.lua +++ b/pfUI.lua @@ -64,6 +64,7 @@ pfUI_config = { debug = 1, ["unitframes"] = { animation_speed = 1, + portrait = 1, buff_size = "22", debuff_size = "22", layout = "default",