cleanup ace3

This commit is contained in:
Pinya
2018-07-22 17:15:08 +03:00
parent 14baf867a4
commit 5268beee39
6 changed files with 17 additions and 18 deletions
@@ -1956,6 +1956,8 @@ end
-- @param ... The path in the options table to feed into the interface options panel. -- @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. -- @return The reference to the frame registered into the Interface Options.
function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...) function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
error("Blizzard InterfaceOptions not available", 2)
--[[
local BlizOptions = AceConfigDialog.BlizOptions local BlizOptions = AceConfigDialog.BlizOptions
local key = appName local key = appName
@@ -1988,4 +1990,5 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
else else
error(format("%s has already been added to the Blizzard Options Window with the given path", appName), 2) error(format("%s has already been added to the Blizzard Options Window with the given path", appName), 2)
end end
]]
end end
@@ -16,32 +16,32 @@ local CreateFrame = CreateFrame
Scripts Scripts
-------------------------------------------------------------------------------]] -------------------------------------------------------------------------------]]
local function OnShow(frame) local function OnShow()
frame.obj:Fire("OnShow") this.obj:Fire("OnShow")
end end
local function OnHide(frame) local function OnHide()
frame.obj:Fire("OnHide") this.obj:Fire("OnHide")
end end
--[[----------------------------------------------------------------------------- --[[-----------------------------------------------------------------------------
Support functions Support functions
-------------------------------------------------------------------------------]] -------------------------------------------------------------------------------]]
local function okay(frame) local function okay()
frame.obj:Fire("okay") this.obj:Fire("okay")
end end
local function cancel(frame) local function cancel()
frame.obj:Fire("cancel") this.obj:Fire("cancel")
end end
local function default(frame) local function default()
frame.obj:Fire("default") this.obj:Fire("default")
end end
local function refresh(frame) local function refresh()
frame.obj:Fire("refresh") this.obj:Fire("refresh")
end end
--[[----------------------------------------------------------------------------- --[[-----------------------------------------------------------------------------
@@ -307,7 +307,6 @@ local methods = {
height = (parent.content.height or 0) + (offset or 0) or height height = (parent.content.height or 0) + (offset or 0) or height
self.frame.height = (parent.content.height or 0) + (offset or 0) self.frame.height = (parent.content.height or 0) + (offset or 0)
end end
--self.frame:SetHeight(height)
local content = self.content local content = self.content
local contentheight = height - (self.borderoffset + 23) local contentheight = height - (self.borderoffset + 23)
@@ -717,7 +717,6 @@ local function Constructor()
--Container Support --Container Support
local content = CreateFrame("Frame", nil, border) local content = CreateFrame("Frame", nil, border)
content:SetPoint("TOPLEFT", 10, -10) content:SetPoint("TOPLEFT", 10, -10)
--content:SetPoint("BOTTOMRIGHT", -10, 10)
local widget = { local widget = {
frame = frame, frame = frame,
@@ -104,7 +104,6 @@ do
end end
child:ClearAllPoints() child:ClearAllPoints()
child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
-- child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", self.slider:IsShown() and -12 or 0, offset)
status.offset = offset status.offset = offset
status.scrollvalue = value status.scrollvalue = value
end end
@@ -148,7 +147,6 @@ do
if value < 1000 then if value < 1000 then
child:ClearAllPoints() child:ClearAllPoints()
child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset) child:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, offset)
-- child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -12, offset)
status.offset = offset status.offset = offset
end end
end end
@@ -324,7 +322,6 @@ do
scrollFrame:SetWidth(defaultWidth - 12) scrollFrame:SetWidth(defaultWidth - 12)
scrollFrame:SetHeight(self.maxHeight - 24) scrollFrame:SetHeight(self.maxHeight - 24)
scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12) scrollFrame:SetPoint("TOPLEFT", frame, "TOPLEFT", 6, -12)
-- scrollFrame:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -6, 12)
scrollFrame:EnableMouseWheel(true) scrollFrame:EnableMouseWheel(true)
scrollFrame:SetScript("OnMouseWheel", OnMouseWheel) scrollFrame:SetScript("OnMouseWheel", OnMouseWheel)
scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
@@ -333,7 +330,6 @@ do
itemFrame:SetWidth(defaultWidth - 12) itemFrame:SetWidth(defaultWidth - 12)
itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0)
-- itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0)
itemFrame:SetHeight(400) itemFrame:SetHeight(400)
itemFrame:SetToplevel(true) itemFrame:SetToplevel(true)
itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") itemFrame:SetFrameStrata("FULLSCREEN_DIALOG")
@@ -1,7 +1,9 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd"> ..\FrameXML\UI.xsd">
<!-- Container --> <!-- Container -->
<!--
<Script file="AceGUIContainer-BlizOptionsGroup.lua"/> <Script file="AceGUIContainer-BlizOptionsGroup.lua"/>
-->
<Script file="AceGUIContainer-DropDownGroup.lua"/> <Script file="AceGUIContainer-DropDownGroup.lua"/>
<Script file="AceGUIContainer-Frame.lua"/> <Script file="AceGUIContainer-Frame.lua"/>
<Script file="AceGUIContainer-InlineGroup.lua"/> <Script file="AceGUIContainer-InlineGroup.lua"/>