From 4fe02b4ddc687ac58a5dd000c59bc865c473230b Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Thu, 1 Sep 2022 18:51:25 -0300 Subject: [PATCH] Fixes --- Libs/DF/button.lua | 3 ++- Libs/DF/fw.lua | 2 +- Libs/DF/panel.lua | 4 +++- Libs/LibGraph-2.0/LibGraph-2.0.lua | 8 ++++++-- Libs/NickTag-1.0/NickTag-1.0.lua | 6 +++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Libs/DF/button.lua b/Libs/DF/button.lua index bc74989d..c7a30df6 100644 --- a/Libs/DF/button.lua +++ b/Libs/DF/button.lua @@ -1098,12 +1098,13 @@ function DF:NewButton (parent, container, name, member, w, h, func, param1, para ButtonObject.text_overlay = _G [name .. "_Text"] ButtonObject.disabled_overlay = _G [name .. "_TextureDisabled"] + texture = texture or "" ButtonObject.button:SetNormalTexture (texture) ButtonObject.button:SetPushedTexture (texture) ButtonObject.button:SetDisabledTexture (texture) ButtonObject.button:SetHighlightTexture (texture, "ADD") - ButtonObject.button.text:SetText (text) + ButtonObject.button.text:SetText (text or "") ButtonObject.button.text:SetPoint ("center", ButtonObject.button, "center") local text_width = ButtonObject.button.text:GetStringWidth() diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index c2ca227d..8fea8ea6 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 334 +local dversion = 336 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua index 84d79237..264de1d5 100644 --- a/Libs/DF/panel.lua +++ b/Libs/DF/panel.lua @@ -5330,6 +5330,7 @@ DF.IconRowFunctions = { iconFrame.Cooldown:SetReverse (self.options.cooldown_reverse) iconFrame.Cooldown:SetDrawSwipe (self.options.cooldown_swipe_enabled) + iconFrame.Cooldown:SetEdgeTexture (self.options.cooldown_edge_texture) iconFrame.Cooldown:SetHideCountdownNumbers (self.options.surpress_blizzard_cd_timer) else iconFrame.timeRemaining = nil @@ -5622,7 +5623,8 @@ local default_icon_row_options = { on_tick_cooldown_update = true, decimal_timer = false, cooldown_reverse = false, - cooldown_swipe = true, + cooldown_swipe_enabled = true, + cooldown_edge_texture = "Interface\\Cooldown\\edge", } function DF:CreateIconRow (parent, name, options) diff --git a/Libs/LibGraph-2.0/LibGraph-2.0.lua b/Libs/LibGraph-2.0/LibGraph-2.0.lua index c981ef7b..20620942 100644 --- a/Libs/LibGraph-2.0/LibGraph-2.0.lua +++ b/Libs/LibGraph-2.0/LibGraph-2.0.lua @@ -11,7 +11,7 @@ Description: Allows for easy creation of graphs --Thanks to Nelson Minar for catching several errors where width was being used instead of height (damn copy and paste >_>) local major = "LibGraph-2.0" -local minor = 90000 + tonumber(("$Revision: 56 $"):match("(%d+)")) +local minor = 90000 + tonumber(("$Revision: 57 $"):match("(%d+)")) --Search for just Addon\\ at the front since the interface part often gets trimmed @@ -23,7 +23,11 @@ do if path then TextureDirectory = "Interface\\AddOns\\"..path else - error(major.." cannot determine the folder it is located in because the path is too long and got truncated in the debugstack(1, 1, 0) function call") + --error(major.." cannot determine the folder it is located in because the path is too long and got truncated in the debugstack(1, 1, 0) function call") + --beta doing some errors here + if (Details) then + TextureDirectory = [[Interface\AddOns\Details\Libs\LibGraph-2.0]] + end end end diff --git a/Libs/NickTag-1.0/NickTag-1.0.lua b/Libs/NickTag-1.0/NickTag-1.0.lua index 1ed4bfc5..ab7701f7 100644 --- a/Libs/NickTag-1.0/NickTag-1.0.lua +++ b/Libs/NickTag-1.0/NickTag-1.0.lua @@ -6,7 +6,7 @@ -- 14: added support for chinese and russian -local major, minor = "NickTag-1.0", 14 +local major, minor = "NickTag-1.0", 15 local NickTag, oldminor = LibStub:NewLibrary (major, minor) if (not NickTag) then @@ -880,7 +880,7 @@ do avatar_pick_frame.selected_color[3] = b end - local okey = CreateFrame ("button", "AvatarPickFrameAccept", avatar_pick_frame, "OptionsButtonTemplate") + local okey = CreateFrame ("button", "AvatarPickFrameAccept", avatar_pick_frame) okey:SetPoint ("bottomright", avatar_pick_frame, "bottomright", -37, 12) okey:SetText ("Accept") okey:SetFrameLevel (avatar_pick_frame:GetFrameLevel()+2) @@ -890,7 +890,7 @@ do avatar_pick_frame.callback (avatar_pick_frame.selected_avatar, {0, 1, 0, 1}, avatar_pick_frame.selected_background, avatar_pick_frame.selected_texcoord, avatar_pick_frame.selected_color) end end) - local change_color = CreateFrame ("button", "AvatarPickFrameColor", avatar_pick_frame, "OptionsButtonTemplate") + local change_color = CreateFrame ("button", "AvatarPickFrameColor", avatar_pick_frame) change_color:SetPoint ("bottomright", avatar_pick_frame, "bottomright", -205, 12) change_color:SetText ("Color") change_color:SetFrameLevel (avatar_pick_frame:GetFrameLevel()+2)