From 5268beee398a15c5140a424af10651dbf5448ab9 Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Sun, 22 Jul 2018 17:15:08 +0300 Subject: [PATCH] cleanup ace3 --- .../AceConfigDialog-3.0.lua | 3 +++ .../AceGUIContainer-BlizOptionsGroup.lua | 24 +++++++++---------- .../widgets/AceGUIContainer-TabGroup.lua | 1 - .../widgets/AceGUIContainer-TreeGroup.lua | 1 - .../widgets/AceGUIWidget-DropDown.lua | 4 ---- .../Libraries/AceGUI-3.0/widgets/widgets.xml | 2 ++ 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index a8e66e3..64b46aa 100644 --- a/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/ElvUI_Config/Libraries/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -1956,6 +1956,8 @@ end -- @param ... The path in the options table to feed into the interface options panel. -- @return The reference to the frame registered into the Interface Options. function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) + error("Blizzard InterfaceOptions not available", 2) +--[[ local BlizOptions = AceConfigDialog.BlizOptions local key = appName @@ -1988,4 +1990,5 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) else error(format("%s has already been added to the Blizzard Options Window with the given path", appName), 2) end +]] end diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua index 9a48f8b..3296798 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua @@ -16,32 +16,32 @@ local CreateFrame = CreateFrame Scripts -------------------------------------------------------------------------------]] -local function OnShow(frame) - frame.obj:Fire("OnShow") +local function OnShow() + this.obj:Fire("OnShow") end -local function OnHide(frame) - frame.obj:Fire("OnHide") +local function OnHide() + this.obj:Fire("OnHide") end --[[----------------------------------------------------------------------------- Support functions -------------------------------------------------------------------------------]] -local function okay(frame) - frame.obj:Fire("okay") +local function okay() + this.obj:Fire("okay") end -local function cancel(frame) - frame.obj:Fire("cancel") +local function cancel() + this.obj:Fire("cancel") end -local function default(frame) - frame.obj:Fire("default") +local function default() + this.obj:Fire("default") end -local function refresh(frame) - frame.obj:Fire("refresh") +local function refresh() + this.obj:Fire("refresh") end --[[----------------------------------------------------------------------------- diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua index 8818150..a27e57c 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua @@ -307,7 +307,6 @@ local methods = { height = (parent.content.height or 0) + (offset or 0) or height self.frame.height = (parent.content.height or 0) + (offset or 0) end - --self.frame:SetHeight(height) local content = self.content local contentheight = height - (self.borderoffset + 23) 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 b5780af..cccfd1a 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -717,7 +717,6 @@ local function Constructor() --Container Support local content = CreateFrame("Frame", nil, border) content:SetPoint("TOPLEFT", 10, -10) - --content:SetPoint("BOTTOMRIGHT", -10, 10) local widget = { frame = frame, diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua index 81e36e6..912d6b8 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -104,7 +104,6 @@ do end child:ClearAllPoints() child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) --- child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset) status.offset = offset status.scrollvalue = value end @@ -148,7 +147,6 @@ do if value < 1000 then child:ClearAllPoints() child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) --- child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset) status.offset = offset end end @@ -324,7 +322,6 @@ do scrollFrame:SetWidth(defaultWidth - 12) scrollFrame:SetHeight(self.maxHeight - 24) scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12) --- scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12) scrollFrame:EnableMouseWheel(true) scrollFrame:SetScript("OnMouseWheel", OnMouseWheel) scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) @@ -333,7 +330,6 @@ do itemFrame:SetWidth(defaultWidth - 12) itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) --- itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0) itemFrame:SetHeight(400) itemFrame:SetToplevel(true) itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") diff --git a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/widgets.xml b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/widgets.xml index e2b1304..7e11209 100644 --- a/ElvUI_Config/Libraries/AceGUI-3.0/widgets/widgets.xml +++ b/ElvUI_Config/Libraries/AceGUI-3.0/widgets/widgets.xml @@ -1,7 +1,9 @@ +