From 4c16d04598ece7cab0e0c61672d5eb63ab9783b7 Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Sun, 10 Jun 2018 00:57:16 +0300 Subject: [PATCH] update --- ElvUI/Modules/UnitFrames/Elements/Portrait.lua | 8 ++++---- ElvUI_Config/Libraries/AceGUI-3.0/AceGUI-3.0.lua | 10 +++++----- .../AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua | 3 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ElvUI/Modules/UnitFrames/Elements/Portrait.lua b/ElvUI/Modules/UnitFrames/Elements/Portrait.lua index 997169b..31ef925 100644 --- a/ElvUI/Modules/UnitFrames/Elements/Portrait.lua +++ b/ElvUI/Modules/UnitFrames/Elements/Portrait.lua @@ -54,11 +54,11 @@ function UF:Configure_Portrait(frame, dontHide) portrait:SetParent(frame.Health); end - portrait:SetAllPoints(frame.Health); + --portrait:SetAllPoints(frame.Health); + portrait:SetWidth(frame.Health:GetWidth() - (frame.BORDER*2)) + portrait:SetHeight(frame.Health:GetHeight() - (frame.BORDER*2)) + portrait:SetPoint("TOPLEFT", frame.Health, "TOPLEFT", frame.BORDER, -frame.BORDER) - portrait:SetPoint("TOPLEFT", frame.Health, "TOPLEFT", - frame.BORDER - frame.SPACING, -(frame.BORDER + frame.SPACING)) - portrait:SetPoint("BOTTOMLEFT", frame.Health, "BOTTOMLEFT", - frame.BORDER - frame.SPACING, -(frame.BORDER + frame.SPACING)) - portrait:SetAlpha(0.35); if(not dontHide) then portrait:Show(); diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/AceGUI-3.0.lua b/ElvUI_Config/Libraries/AceGUI-3.0/AceGUI-3.0.lua index 3b8340f..8cc6fc2 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/AceGUI-3.0.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/AceGUI-3.0.lua @@ -256,7 +256,7 @@ do end WidgetBase.Fire = function(self, name, argc, ...) - argc = table.getn(arg) + argc = arg.n local func = self.events[name] if func then local success, ret = safecall(func, argc+3, self, name, argc, unpack(arg)) @@ -310,8 +310,8 @@ do AceGUI:Release(self) end - WidgetBase.SetPoint = function(self,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) - return self.frame:SetPoint(a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) + WidgetBase.SetPoint = function(self, a1,a2,a3,a4,a5) + return self.frame:SetPoint(a1,a2,a3,a4,a5) end WidgetBase.ClearAllPoints = function(self) @@ -322,8 +322,8 @@ do return self.frame:GetNumPoints() end - WidgetBase.GetPoint = function(self,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) - return self.frame:GetPoint(a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) + WidgetBase.GetPoint = function(self, a1,a2,a3,a4,a5) + return self.frame:GetPoint(a1,a2,a3,a4,a5) end WidgetBase.GetUserDataTable = function(self) diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua index 6537fb1..4eb8b4f 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -419,7 +419,6 @@ local methods = { end, ["RefreshTree"] = function(self,scrollToSelection) - local t = GetTime() local buttons = self.buttons local lines = self.lines @@ -542,7 +541,7 @@ local methods = { self.filter = false local status = self.status or self.localstatus local groups = status.groups - for i = 1, tgetn(arg) do + for i = 1, arg.n do groups[tconcat(arg, "\001", 1, i)] = true end status.selected = uniquevalue