diff --git a/Titan/Titan.toc b/Titan/Titan.toc index e0c09f7..78f004f 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ -## Interface: 80300 -## Title: Titan Panel |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel |cff00aa006.00.00.90001|r ## Author: Titan Panel Development Team -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanPanelTemplate.xml b/Titan/TitanPanelTemplate.xml index c8c0796..19f99e7 100644 --- a/Titan/TitanPanelTemplate.xml +++ b/Titan/TitanPanelTemplate.xml @@ -2,6 +2,9 @@ ..\FrameXML\UI.xsd"> <Script file="TitanPanelTemplate.lua" /> <Button name="TitanPanelButtonTemplate" hidden="true" movable="true" virtual="true"> + <!-- + inherits="BackdropTemplate" mixin="BackdropTemplateMixin" + --> <!-- Removed on 20181229 to deal with the new LibUIDropDownMenu <Frames> <Frame name="$parentRightClickMenu" inherits="L_UIDropDownMenuTemplate" id="1" hidden="true"> @@ -9,7 +12,7 @@ </Frames> --> <Scripts> - <OnLoad> + <OnLoad> <!-- inherit="prepend" --> TitanPanelButton_OnLoad(self); </OnLoad> <OnShow> @@ -103,13 +106,14 @@ <AbsDimension x="0" y="0"/> </PushedTextOffset> </Button> - <Slider name="TitanOptionsSliderTemplate" orientation="VERTICAL" virtual="true" enableMouse="true" EnableMouseWheel="true"> + <Slider name="TitanOptionsSliderTemplate" orientation="VERTICAL" inherits="BackdropTemplate" virtual="true" enableMouse="true" EnableMouseWheel="true"> <Size> <AbsDimension x="10" y="100"/> </Size> <HitRectInsets> <AbsInset left="-10" right="-10" top="0" bottom="0"/> </HitRectInsets> +<!-- Removed on 20200817 to deal with the new Backdrop API for 9.0 (Shadowlands) <Backdrop bgFile="Interface\Buttons\UI-SliderBar-Background" edgeFile="Interface\Buttons\UI-SliderBar-Border" tile="true"> <EdgeSize> <AbsValue val="8"/> @@ -121,6 +125,7 @@ <AbsInset left="6" right="6" top="3" bottom="3"/> </BackgroundInsets> </Backdrop> +--> <Layers> <Layer level="ARTWORK"> <FontString name="$parentText" inherits="GameFontGreenSmall"> diff --git a/Titan/libs/!LibUIDropDownMenu/LibUIDropDownMenu/LibUIDropDownMenu.lua b/Titan/libs/!LibUIDropDownMenu/LibUIDropDownMenu/LibUIDropDownMenu.lua index 37ecff3..68d1f6e 100755 --- a/Titan/libs/!LibUIDropDownMenu/LibUIDropDownMenu/LibUIDropDownMenu.lua +++ b/Titan/libs/!LibUIDropDownMenu/LibUIDropDownMenu/LibUIDropDownMenu.lua @@ -218,7 +218,7 @@ local function creatre_UIDropDownList(name, parent) f:SetFrameStrata("DIALOG") f:EnableMouse(true) - f.Backdrop = _G[name.."Backdrop"] or CreateFrame("Frame", name.."Backdrop", f) + f.Backdrop = _G[name.."Backdrop"] or CreateFrame("Frame", name.."Backdrop", f, BackdropTemplateMixin and "BackdropTemplate") f.Backdrop:SetAllPoints() f.Backdrop:SetBackdrop({ bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background-Dark", @@ -229,7 +229,7 @@ local function creatre_UIDropDownList(name, parent) insets = { left = 11, right = 12, top = 12, bottom = 9, }, }) - f.MenuBackdrop= _G[name.."MenuBackdrop"] or CreateFrame("Frame", name.."MenuBackdrop", f) + f.MenuBackdrop= _G[name.."MenuBackdrop"] or CreateFrame("Frame", name.."MenuBackdrop", f, BackdropTemplateMixin and "BackdropTemplate") f.MenuBackdrop:SetAllPoints() f.MenuBackdrop:SetBackdrop({ bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", diff --git a/Titan/libs/Ace3.toc b/Titan/libs/Ace3.toc index 6faf538..d2db37e 100755 --- a/Titan/libs/Ace3.toc +++ b/Titan/libs/Ace3.toc @@ -1,4 +1,4 @@ -## Interface: 80200 +## Interface: 80300 ## Title: Lib: Ace3 ## Notes: AddOn development framework diff --git a/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua index 3e3d878..b6ac529 100755 --- a/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua +++ b/Titan/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua @@ -1,13 +1,13 @@ --- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables. -- @class file -- @name AceConfigDialog-3.0 --- @release $Id: AceConfigDialog-3.0.lua 1212 2019-06-26 05:53:51Z nevcairiel $ +-- @release $Id: AceConfigDialog-3.0.lua 1232 2020-04-14 22:21:22Z nevcairiel $ local LibStub = LibStub local gui = LibStub("AceGUI-3.0") local reg = LibStub("AceConfigRegistry-3.0") -local MAJOR, MINOR = "AceConfigDialog-3.0", 73 +local MAJOR, MINOR = "AceConfigDialog-3.0", 79 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not AceConfigDialog then return end @@ -15,6 +15,7 @@ if not AceConfigDialog then return end AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {} AceConfigDialog.Status = AceConfigDialog.Status or {} AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame") +AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate") AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {} AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {} @@ -30,7 +31,7 @@ local math_min, math_max, math_floor = math.min, math.max, math.floor -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded -- List them here for Mikk's FindGlobals script --- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show +-- GLOBALS: NORMAL_FONT_COLOR, ACCEPT, CANCEL -- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge -- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler @@ -504,8 +505,9 @@ local function OptionOnMouseOver(widget, event) local options = user.options local path = user.path local appName = user.appName + local tooltip = AceConfigDialog.tooltip - GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT") + tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT") local name = GetOptionsMemberValue("name", opt, options, path, appName) local desc = GetOptionsMemberValue("desc", opt, options, path, appName) local usage = GetOptionsMemberValue("usage", opt, options, path, appName) @@ -513,23 +515,23 @@ local function OptionOnMouseOver(widget, event) if descStyle and descStyle ~= "tooltip" then return end - GameTooltip:SetText(name, 1, .82, 0, true) + tooltip:SetText(name, 1, .82, 0, true) if opt.type == "multiselect" then - GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true) + tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true) end if type(desc) == "string" then - GameTooltip:AddLine(desc, 1, 1, 1, true) + tooltip:AddLine(desc, 1, 1, 1, true) end if type(usage) == "string" then - GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true) + tooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true) end - GameTooltip:Show() + tooltip:Show() end local function OptionOnMouseLeave(widget, event) - GameTooltip:Hide() + AceConfigDialog.tooltip:Hide() end local function GetFuncName(option) @@ -540,71 +542,123 @@ local function GetFuncName(option) return "set" end end +do + local frame = AceConfigDialog.popup + if not frame then + frame = CreateFrame("Frame", nil, UIParent) + AceConfigDialog.popup = frame + frame:Hide() + frame:SetPoint("CENTER", UIParent, "CENTER") + frame:SetSize(320, 72) + frame:SetFrameStrata("TOOLTIP") + frame:SetScript("OnKeyDown", function(self, key) + if key == "ESCAPE" then + self:SetPropagateKeyboardInput(false) + if self.cancel:IsShown() then + self.cancel:Click() + else -- Showing a validation error + self:Hide() + end + else + self:SetPropagateKeyboardInput(true) + end + end) + + if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then + frame:SetBackdrop({ + bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]], + edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]], + tile = true, + tileSize = 32, + edgeSize = 32, + insets = { left = 11, right = 11, top = 11, bottom = 11 }, + }) + else + local border = CreateFrame("Frame", nil, frame, "DialogBorderDarkTemplate") + border:SetAllPoints(frame) + end + + local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight") + text:SetSize(290, 0) + text:SetPoint("TOP", 0, -16) + frame.text = text + + local function newButton(text) + local button = CreateFrame("Button", nil, frame) + button:SetSize(128, 21) + button:SetNormalFontObject(GameFontNormal) + button:SetHighlightFontObject(GameFontHighlight) + button:SetNormalTexture(130763) -- "Interface\\Buttons\\UI-DialogBox-Button-Up" + button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875) + button:SetPushedTexture(130761) -- "Interface\\Buttons\\UI-DialogBox-Button-Down" + button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875) + button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight" + button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875) + button:SetText(text) + return button + end + + local accept = newButton(ACCEPT) + accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16) + frame.accept = accept + + local cancel = newButton(CANCEL) + cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0) + frame.cancel = cancel + end +end local function confirmPopup(appName, rootframe, basepath, info, message, func, ...) - if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then - StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {} - end - local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] - for k in pairs(t) do - t[k] = nil - end - t.text = message - t.button1 = ACCEPT - t.button2 = CANCEL - t.preferredIndex = STATICPOPUP_NUMDIALOGS - local dialog, oldstrata - t.OnAccept = function() - safecall(func, unpack(t)) - if dialog and oldstrata then - dialog:SetFrameStrata(oldstrata) - end + local frame = AceConfigDialog.popup + frame:Show() + frame.text:SetText(message) + -- From StaticPopup.lua + -- local height = 32 + text:GetHeight() + 2; + -- height = height + 6 + accept:GetHeight() + -- We add 32 + 2 + 6 + 21 (button height) == 61 + local height = 61 + frame.text:GetHeight() + frame:SetHeight(height) + + frame.accept:ClearAllPoints() + frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16) + frame.cancel:Show() + + local t = {...} + local tCount = select("#", ...) + frame.accept:SetScript("OnClick", function(self) + safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table) AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) + frame:Hide() + self:SetScript("OnClick", nil) + frame.cancel:SetScript("OnClick", nil) del(info) - end - t.OnCancel = function() - if dialog and oldstrata then - dialog:SetFrameStrata(oldstrata) - end + end) + frame.cancel:SetScript("OnClick", function(self) AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl)) + frame:Hide() + self:SetScript("OnClick", nil) + frame.accept:SetScript("OnClick", nil) del(info) - end - for i = 1, select("#", ...) do - t[i] = select(i, ...) or false - end - t.timeout = 0 - t.whileDead = 1 - t.hideOnEscape = 1 - - dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG") - if dialog then - oldstrata = dialog:GetFrameStrata() - dialog:SetFrameStrata("TOOLTIP") - end + end) end local function validationErrorPopup(message) - if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then - StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {} - end - local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] - t.text = message - t.button1 = OKAY - t.preferredIndex = STATICPOPUP_NUMDIALOGS - local dialog, oldstrata - t.OnAccept = function() - if dialog and oldstrata then - dialog:SetFrameStrata(oldstrata) - end - end - t.timeout = 0 - t.whileDead = 1 - t.hideOnEscape = 1 - - dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG") - if dialog then - oldstrata = dialog:GetFrameStrata() - dialog:SetFrameStrata("TOOLTIP") - end + local frame = AceConfigDialog.popup + frame:Show() + frame.text:SetText(message) + -- From StaticPopup.lua + -- local height = 32 + text:GetHeight() + 2; + -- height = height + 6 + accept:GetHeight() + -- We add 32 + 2 + 6 + 21 (button height) == 61 + local height = 61 + frame.text:GetHeight() + frame:SetHeight(height) + + frame.accept:ClearAllPoints() + frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16) + frame.cancel:Hide() + + frame.accept:SetScript("OnClick", function() + frame:Hide() + end) end local function ActivateControl(widget, event, ...) @@ -857,7 +911,7 @@ end local function MultiControlOnClosed(widget, event, ...) local user = widget:GetUserDataTable() - if user.valuechanged then + if user.valuechanged and not widget:IsReleasing() then local iscustom = user.rootframe:GetUserData("iscustom") local basepath = user.rootframe:GetUserData("basepath") or emptyTbl if iscustom then @@ -1433,6 +1487,7 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button) local option = user.option local path = user.path local appName = user.appName + local tooltip = AceConfigDialog.tooltip local feedpath = new() for i = 1, #path do @@ -1449,25 +1504,25 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button) local name = GetOptionsMemberValue("name", group, options, feedpath, appName) local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName) - GameTooltip:SetOwner(button, "ANCHOR_NONE") - GameTooltip:ClearAllPoints() + tooltip:SetOwner(button, "ANCHOR_NONE") + tooltip:ClearAllPoints() if widget.type == "TabGroup" then - GameTooltip:SetPoint("BOTTOM",button,"TOP") + tooltip:SetPoint("BOTTOM",button,"TOP") else - GameTooltip:SetPoint("LEFT",button,"RIGHT") + tooltip:SetPoint("LEFT",button,"RIGHT") end - GameTooltip:SetText(name, 1, .82, 0, true) + tooltip:SetText(name, 1, .82, 0, true) if type(desc) == "string" then - GameTooltip:AddLine(desc, 1, 1, 1, true) + tooltip:AddLine(desc, 1, 1, 1, true) end - GameTooltip:Show() + tooltip:Show() end local function TreeOnButtonLeave(widget, event, value, button) - GameTooltip:Hide() + AceConfigDialog.tooltip:Hide() end diff --git a/Titan/libs/AceGUI-3.0/AceGUI-3.0.lua b/Titan/libs/AceGUI-3.0/AceGUI-3.0.lua index efdb6cb..724b151 100755 --- a/Titan/libs/AceGUI-3.0/AceGUI-3.0.lua +++ b/Titan/libs/AceGUI-3.0/AceGUI-3.0.lua @@ -24,8 +24,8 @@ -- f:AddChild(btn) -- @class file -- @name AceGUI-3.0 --- @release $Id: AceGUI-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $ -local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 36 +-- @release $Id: AceGUI-3.0.lua 1231 2020-04-14 22:20:36Z nevcairiel $ +local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR) if not AceGUI then return end -- No upgrade needed @@ -51,6 +51,7 @@ AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {} AceGUI.WidgetBase = AceGUI.WidgetBase or {} AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {} AceGUI.WidgetVersions = AceGUI.WidgetVersions or {} +AceGUI.tooltip = AceGUI.tooltip or CreateFrame("GameTooltip", "AceGUITooltip", UIParent, "GameTooltipTemplate") -- local upvalues local WidgetRegistry = AceGUI.WidgetRegistry @@ -175,7 +176,10 @@ end -- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well. -- @param widget The widget to release function AceGUI:Release(widget) + if widget.isQueuedForRelease then return end + widget.isQueuedForRelease = true safecall(widget.PauseLayout, widget) + widget.frame:Hide() widget:Fire("OnRelease") safecall(widget.ReleaseChildren, widget) @@ -204,9 +208,26 @@ function AceGUI:Release(widget) widget.content.width = nil widget.content.height = nil end + widget.isQueuedForRelease = nil delWidget(widget, widget.type) end +--- Check if a widget is currently in the process of being released +-- This function check if this widget, or any of its parents (in which case it'll be released shortly as well) +-- are currently being released. This allows addon to handle any callbacks accordingly. +-- @param widget The widget to check +function AceGUI:IsReleasing(widget) + if widget.isQueuedForRelease then + return true + end + + if widget.parent and widget.parent.AceGUIWidgetVersion then + return AceGUI:IsReleasing(widget.parent) + end + + return false +end + ----------- -- Focus -- ----------- @@ -333,6 +354,10 @@ do AceGUI:Release(self) end + WidgetBase.IsReleasing = function(self) + return AceGUI:IsReleasing(self) + end + WidgetBase.SetPoint = function(self, ...) return self.frame:SetPoint(...) end @@ -638,6 +663,7 @@ AceGUI:RegisterLayout("Fill", if children[1] then children[1]:SetWidth(content:GetWidth() or 0) children[1]:SetHeight(content:GetHeight() or 0) + children[1].frame:ClearAllPoints() children[1].frame:SetAllPoints(content) children[1].frame:Show() safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight()) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua index aacb0fc..c4c6092 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua @@ -2,7 +2,7 @@ DropdownGroup Container Container controlled by a dropdown on the top. -------------------------------------------------------------------------------]] -local Type, Version = "DropdownGroup", 21 +local Type, Version = "DropdownGroup", 22 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -125,7 +125,7 @@ local function Constructor() dropdown.frame:Show() dropdown:SetLabel("") - local border = CreateFrame("Frame", nil, frame) + local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) border:SetPoint("TOPLEFT", 0, -26) border:SetPoint("BOTTOMRIGHT", 0, 3) border:SetBackdrop(PaneBackdrop) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua index aff1416..5fef676 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua @@ -1,7 +1,7 @@ --[[----------------------------------------------------------------------------- Frame Container -------------------------------------------------------------------------------]] -local Type, Version = "Frame", 26 +local Type, Version = "Frame", 27 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -179,7 +179,7 @@ local PaneBackdrop = { } local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) + local frame = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil) frame:Hide() frame:EnableMouse(true) @@ -201,7 +201,7 @@ local function Constructor() closebutton:SetWidth(100) closebutton:SetText(CLOSE) - local statusbg = CreateFrame("Button", nil, frame) + local statusbg = CreateFrame("Button", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) statusbg:SetPoint("BOTTOMLEFT", 15, 15) statusbg:SetPoint("BOTTOMRIGHT", -132, 15) statusbg:SetHeight(24) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua index 1a330ef..26db900 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua @@ -2,7 +2,7 @@ InlineGroup Container Simple container widget that creates a visible "box" with an optional title. -------------------------------------------------------------------------------]] -local Type, Version = "InlineGroup", 21 +local Type, Version = "InlineGroup", 22 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -75,7 +75,7 @@ local function Constructor() titletext:SetJustifyH("LEFT") titletext:SetHeight(18) - local border = CreateFrame("Frame", nil, frame) + local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) border:SetPoint("TOPLEFT", 0, -17) border:SetPoint("BOTTOMRIGHT", -1, 3) border:SetBackdrop(PaneBackdrop) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua index 466fbbd..306c719 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua @@ -2,7 +2,7 @@ TabGroup Container Container that uses tabs on top to switch between groups. -------------------------------------------------------------------------------]] -local Type, Version = "TabGroup", 36 +local Type, Version = "TabGroup", 37 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -316,7 +316,7 @@ local function Constructor() titletext:SetHeight(18) titletext:SetText("") - local border = CreateFrame("Frame", nil, frame) + local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) border:SetPoint("TOPLEFT", 1, -27) border:SetPoint("BOTTOMRIGHT", -1, 3) border:SetBackdrop(PaneBackdrop) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua index 48586ef..c09c5ec 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua @@ -2,12 +2,10 @@ TreeGroup Container Container that uses a tree control to switch between groups. -------------------------------------------------------------------------------]] -local Type, Version = "TreeGroup", 42 +local Type, Version = "TreeGroup", 45 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end -local WoW80 = select(4, GetBuildInfo()) >= 80000 - -- Lua APIs local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type local math_min, math_max, floor = math.min, math.max, floor @@ -18,7 +16,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent -- Global vars/functions that we don't upvalue since they might get hooked, or upgraded -- List them here for Mikk's FindGlobals script --- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE +-- GLOBALS: FONT_COLOR_CODE_CLOSE -- Recycling functions local new, del @@ -208,12 +206,13 @@ local function Button_OnEnter(frame) self:Fire("OnButtonEnter", frame.uniquevalue, frame) if self.enabletooltips then - GameTooltip:SetOwner(frame, "ANCHOR_NONE") - GameTooltip:ClearAllPoints() - GameTooltip:SetPoint("LEFT",frame,"RIGHT") - GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true) + local tooltip = AceGUI.tooltip + tooltip:SetOwner(frame, "ANCHOR_NONE") + tooltip:ClearAllPoints() + tooltip:SetPoint("LEFT",frame,"RIGHT") + tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true) - GameTooltip:Show() + tooltip:Show() end end @@ -222,7 +221,7 @@ local function Button_OnLeave(frame) self:Fire("OnButtonLeave", frame.uniquevalue, frame) if self.enabletooltips then - GameTooltip:Hide() + AceGUI.tooltip:Hide() end end @@ -268,14 +267,15 @@ end local function Dragger_OnMouseUp(frame) local treeframe = frame:GetParent() local self = treeframe.obj - local frame = treeframe:GetParent() + local treeframeParent = treeframe:GetParent() treeframe:StopMovingOrSizing() --treeframe:SetScript("OnUpdate", nil) treeframe:SetUserPlaced(false) --Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize treeframe:SetHeight(0) - treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0) - treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0) + treeframe:ClearAllPoints() + treeframe:SetPoint("TOPLEFT", treeframeParent, "TOPLEFT",0,0) + treeframe:SetPoint("BOTTOMLEFT", treeframeParent, "BOTTOMLEFT",0,0) local status = self.status or self.localstatus status.treewidth = treeframe:GetWidth() @@ -420,8 +420,7 @@ local methods = { local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18)) if maxlines <= 0 then return end - -- workaround for lag spikes on WoW 8.0 - if WoW80 and self.frame:GetParent() == UIParent and not fromOnUpdate then + if self.frame:GetParent() == UIParent and not fromOnUpdate then self.frame:SetScript("OnUpdate", FirstFrameUpdate) return end @@ -630,7 +629,7 @@ local PaneBackdrop = { local DraggerBackdrop = { bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", edgeFile = nil, - tile = true, tileSize = 16, edgeSize = 0, + tile = true, tileSize = 16, edgeSize = 1, insets = { left = 3, right = 3, top = 7, bottom = 7 } } @@ -638,7 +637,7 @@ local function Constructor() local num = AceGUI:GetNextWidgetNum(Type) local frame = CreateFrame("Frame", nil, UIParent) - local treeframe = CreateFrame("Frame", nil, frame) + local treeframe = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) treeframe:SetPoint("TOPLEFT") treeframe:SetPoint("BOTTOMLEFT") treeframe:SetWidth(DEFAULT_TREE_WIDTH) @@ -653,7 +652,7 @@ local function Constructor() treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged) treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel) - local dragger = CreateFrame("Frame", nil, treeframe) + local dragger = CreateFrame("Frame", nil, treeframe, BackdropTemplateMixin and "BackdropTemplate" or nil) dragger:SetWidth(8) dragger:SetPoint("TOP", treeframe, "TOPRIGHT") dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT") @@ -678,7 +677,7 @@ local function Constructor() scrollbg:SetAllPoints(scrollbar) scrollbg:SetColorTexture(0,0,0,0.4) - local border = CreateFrame("Frame",nil,frame) + local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") border:SetPoint("BOTTOMRIGHT") border:SetBackdrop(PaneBackdrop) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua index f8a0d1f..c795910 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua @@ -1,4 +1,4 @@ ---[[ $Id: AceGUIWidget-DropDown.lua 1209 2019-06-24 21:01:01Z nevcairiel $ ]]-- +--[[ $Id: AceGUIWidget-DropDown.lua 1237 2020-07-17 22:50:38Z nevcairiel $ ]]-- local AceGUI = LibStub("AceGUI-3.0") -- Lua APIs @@ -39,7 +39,7 @@ end do local widgetType = "Dropdown-Pullout" - local widgetVersion = 3 + local widgetVersion = 4 --[[ Static data ]]-- @@ -258,7 +258,7 @@ do local function Constructor() local count = AceGUI:GetNextWidgetNum(widgetType) - local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent) + local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil) local self = {} self.count = count self.type = widgetType @@ -309,7 +309,7 @@ do scrollFrame.obj = self itemFrame.obj = self - local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame) + local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, BackdropTemplateMixin and "BackdropTemplate" or nil) slider:SetOrientation("VERTICAL") slider:SetHitRectInsets(0, 0, -10, 0) slider:SetBackdrop(sliderBackdrop) @@ -356,7 +356,7 @@ end do local widgetType = "Dropdown" - local widgetVersion = 34 + local widgetVersion = 35 --[[ Static data ]]-- @@ -465,6 +465,7 @@ do self:SetWidth(200) self:SetLabel() self:SetPulloutWidth(nil) + self.list = {} end -- exported, AceGUI callback @@ -535,9 +536,7 @@ do -- exported local function SetValue(self, value) - if self.list then - self:SetText(self.list[value] or "") - end + self:SetText(self.list[value] or "") self.value = value end @@ -601,7 +600,7 @@ do end end local function SetList(self, list, order, itemType) - self.list = list + self.list = list or {} self.pullout:Clear() self.hasClose = nil if not list then return end @@ -629,10 +628,8 @@ do -- exported local function AddItem(self, value, text, itemType) - if self.list then - self.list[value] = text - AddListItem(self, value, text, itemType) - end + self.list[value] = text + AddListItem(self, value, text, itemType) end -- exported diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua index e77023a..b195e0c 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua @@ -2,7 +2,7 @@ Keybinding Widget Set Keybindings in the Config UI. -------------------------------------------------------------------------------]] -local Type, Version = "Keybinding", 25 +local Type, Version = "Keybinding", 26 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -214,7 +214,7 @@ local function Constructor() label:SetJustifyH("CENTER") label:SetHeight(18) - local msgframe = CreateFrame("Frame", nil, UIParent) + local msgframe = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil) msgframe:SetHeight(30) msgframe:SetBackdrop(ControlBackdrop) msgframe:SetBackdropColor(0,0,0) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua index 79fddc4..2cce725 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua @@ -2,7 +2,7 @@ Label Widget Displays text and optionally an icon. -------------------------------------------------------------------------------]] -local Type, Version = "Label", 26 +local Type, Version = "Label", 27 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -130,6 +130,7 @@ local methods = { ["SetFont"] = function(self, font, height, flags) self.label:SetFont(font, height, flags) + UpdateImageAnchor(self) end, ["SetFontObject"] = function(self, font) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua index 46a75b1..cfcb500 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua @@ -1,4 +1,4 @@ -local Type, Version = "MultiLineEditBox", 28 +local Type, Version = "MultiLineEditBox", 29 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -297,7 +297,7 @@ local function Constructor() text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1) text:SetJustifyV("MIDDLE") - local scrollBG = CreateFrame("Frame", nil, frame) + local scrollBG = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) scrollBG:SetBackdrop(backdrop) scrollBG:SetBackdropColor(0, 0, 0) scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4) diff --git a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua index 79e8628..ea655b6 100755 --- a/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua +++ b/Titan/libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua @@ -2,7 +2,7 @@ Slider Widget Graphical Slider, like, for Range values. -------------------------------------------------------------------------------]] -local Type, Version = "Slider", 22 +local Type, Version = "Slider", 23 local AceGUI = LibStub and LibStub("AceGUI-3.0", true) if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end @@ -225,7 +225,7 @@ local function Constructor() label:SetJustifyH("CENTER") label:SetHeight(15) - local slider = CreateFrame("Slider", nil, frame) + local slider = CreateFrame("Slider", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) slider:SetOrientation("HORIZONTAL") slider:SetHeight(15) slider:SetHitRectInsets(0, 0, -10, 0) @@ -247,7 +247,7 @@ local function Constructor() local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3) - local editbox = CreateFrame("EditBox", nil, frame) + local editbox = CreateFrame("EditBox", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil) editbox:SetAutoFocus(false) editbox:SetFontObject(GameFontHighlightSmall) editbox:SetPoint("TOP", slider, "BOTTOM") diff --git a/Titan/libs/CHANGES.txt b/Titan/libs/CHANGES.txt index 4dd1447..71203fe 100755 --- a/Titan/libs/CHANGES.txt +++ b/Titan/libs/CHANGES.txt @@ -1,25 +1,72 @@ ------------------------------------------------------------------------ -r60 | nevcairiel | 2019-06-14 23:53:41 +0000 (Fri, 14 Jun 2019) | 1 line +r1237 | nevcairiel | 2020-07-17 22:50:38 +0000 (Fri, 17 Jul 2020) | 1 line Changed paths: - M /trunk/AceGUI-3.0-SharedMediaWidgets.toc + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua -Update TOC +Use BackdropTemplate in WoW 9.0 ------------------------------------------------------------------------ -r59 | nevcairiel | 2019-06-14 23:53:15 +0000 (Fri, 14 Jun 2019) | 1 line +r1236 | nevcairiel | 2020-04-16 07:36:45 +0000 (Thu, 16 Apr 2020) | 1 line Changed paths: - M /trunk/AceGUI-3.0-SharedMediaWidgets/BackgroundWidget.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets/BorderWidget.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets/FontWidget.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets/SoundWidget.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets/StatusbarWidget.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets/prototypes.lua + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua -Remove unnecessary UpdateScrollChildRect() calls. The Scroll Child is recomputed when needed automatically, and this improves performance significantly +AceGUI-3.0: DropDown: Initialize the widget with an empty item list (instead of nil), this allows AddItem to be used right away (Fixes #542) ------------------------------------------------------------------------ -r58 | nevcairiel | 2018-06-21 23:05:54 +0000 (Thu, 21 Jun 2018) | 1 line +r1235 | nevcairiel | 2020-04-15 10:27:55 +0000 (Wed, 15 Apr 2020) | 1 line Changed paths: - M /trunk/AceGUI-3.0-SharedMediaWidgets/prototypes.lua + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua -Hard code a version to avoid issues with the version being populated from the hosting repository +Cleanup debug +------------------------------------------------------------------------ +r1234 | nevcairiel | 2020-04-15 10:14:35 +0000 (Wed, 15 Apr 2020) | 1 line +Changed paths: + M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua + +AceGUI-3.0: TreeGroup: Remove pre-8.0 compat +------------------------------------------------------------------------ +r1233 | nevcairiel | 2020-04-15 10:09:47 +0000 (Wed, 15 Apr 2020) | 1 line +Changed paths: + M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Label.lua + +AceGUI-3.0: Label: Refresh anchoring after changing the font (Fixes #540) +------------------------------------------------------------------------ +r1232 | nevcairiel | 2020-04-14 22:21:22 +0000 (Tue, 14 Apr 2020) | 1 line +Changed paths: + M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua + +AceConfigDialog-3.0: Prevent a dialog refresh when a multiselect control is closed during release (Fixes #539) +------------------------------------------------------------------------ +r1231 | nevcairiel | 2020-04-14 22:20:36 +0000 (Tue, 14 Apr 2020) | 1 line +Changed paths: + M /trunk/AceGUI-3.0/AceGUI-3.0.lua + +AceGUI-3.0: Add a getter to allow callers to check if a widget is currently being released, which can be used as part of some callbacks to alter behavior +------------------------------------------------------------------------ +r1230 | funkydude | 2020-01-14 17:01:25 +0000 (Tue, 14 Jan 2020) | 1 line +Changed paths: + M /trunk/Ace3.toc + +bump toc +------------------------------------------------------------------------ +r1229 | funkydude | 2019-10-11 20:48:50 +0000 (Fri, 11 Oct 2019) | 1 line +Changed paths: + M /trunk/Ace3.toc + +bump toc +------------------------------------------------------------------------ +r1228 | nevcairiel | 2019-09-06 08:51:17 +0000 (Fri, 06 Sep 2019) | 3 lines +Changed paths: + M /trunk/AceGUI-3.0/AceGUI-3.0.lua + +AceGUI-3.0: Avoid re-entrance into the Release function + +This can happen if a frame is released in a callback fired in the release process, and may in some cases throw errors. ------------------------------------------------------------------------ diff --git a/Titan/libs/Changelog-Ace3-Release-r1151.txt b/Titan/libs/Changelog-Ace3-Release-r1151.txt deleted file mode 100644 index c78dc9d..0000000 --- a/Titan/libs/Changelog-Ace3-Release-r1151.txt +++ /dev/null @@ -1,92 +0,0 @@ ------------------------------------------------------------------------- -r1151 | nevcairiel | 2016-07-18 17:03:29 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - A /tags/Release-r1151 (from /trunk:1150) - -Tag as Release-r1151 ------------------------------------------------------------------------- -r1150 | nevcairiel | 2016-07-18 17:02:20 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/changelog.txt - -Update changelog ------------------------------------------------------------------------- -r1149 | nevcairiel | 2016-07-18 17:02:10 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/Ace3.toc - -Update TOC for 7.0 ------------------------------------------------------------------------- -r1148 | nevcairiel | 2016-07-18 09:13:02 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua - M /trunk/AceTab-3.0/AceTab-3.0.lua - -Remove remaining compat code for ancient WoW versions ------------------------------------------------------------------------- -r1147 | nevcairiel | 2016-07-18 09:10:10 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Button.lua - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua - -Remove pre-MoP compat code from AceGUI widgets ------------------------------------------------------------------------- -r1146 | nevcairiel | 2016-07-18 09:07:16 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua - -Fix global leak ------------------------------------------------------------------------- -r1145 | nevcairiel | 2016-07-18 08:32:42 +0000 (Mon, 18 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua - -AceGUI-3.0: Keybinding: Support mousewheel up/down bindings (Ticket #372) ------------------------------------------------------------------------- -r1144 | nevcairiel | 2016-07-11 09:04:48 +0000 (Mon, 11 Jul 2016) | 1 line -Changed paths: - M /trunk/changelog.txt - -Re-format changelog to be consistent with older entries ------------------------------------------------------------------------- -r1143 | nevcairiel | 2016-07-11 08:52:03 +0000 (Mon, 11 Jul 2016) | 1 line -Changed paths: - M /trunk/AceConsole-3.0/AceConsole-3.0.lua - -AceConsole-3.0: Fix a typo in the LuaDoc function signature ------------------------------------------------------------------------- -r1142 | nevcairiel | 2016-07-11 08:36:19 +0000 (Mon, 11 Jul 2016) | 1 line -Changed paths: - M /trunk/AceDB-3.0/AceDB-3.0.lua - -AceDB-3.0: Add the "locale" profile key to the LuaDoc (Ticket #344) ------------------------------------------------------------------------- -r1141 | nevcairiel | 2016-07-11 08:32:23 +0000 (Mon, 11 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua - M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua - -AceGUI-3.0: Expose the HighlightText API for EditBox and MultiLineEditBox Widgets (Ticket #378) ------------------------------------------------------------------------- -r1140 | nevcairiel | 2016-07-03 07:53:29 +0000 (Sun, 03 Jul 2016) | 1 line -Changed paths: - M /trunk/AceDBOptions-3.0/AceDBOptions-3.0.lua - -AceDBOptions-3.0: Update localization from the WoWAce Localization system ------------------------------------------------------------------------- -r1139 | nevcairiel | 2016-07-03 07:43:51 +0000 (Sun, 03 Jul 2016) | 1 line -Changed paths: - M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua - M /trunk/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua - -AceConfig-3.0: Allow specifying images using the numeric fileID (Ticket #389) ------------------------------------------------------------------------- -r1138 | nevcairiel | 2016-06-01 10:17:04 +0000 (Wed, 01 Jun 2016) | 3 lines -Changed paths: - M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua - -AceGUI-3.0: TreeGroup: Refresh the tree in an OnUpdate once after Acquire, not only after creation - -The widget creation and acquire can be on different code paths, this ensures the tree height is always known and the tree populated properly. ------------------------------------------------------------------------- diff --git a/Titan/libs/Changelog-AceGUI-3.0-SharedMediaWidgets-r57-release.txt b/Titan/libs/Changelog-AceGUI-3.0-SharedMediaWidgets-r57-release.txt deleted file mode 100644 index 8cd4f20..0000000 --- a/Titan/libs/Changelog-AceGUI-3.0-SharedMediaWidgets-r57-release.txt +++ /dev/null @@ -1,27 +0,0 @@ ------------------------------------------------------------------------- -r57 | nevcairiel | 2016-07-20 21:25:42 +0000 (Wed, 20 Jul 2016) | 1 line -Changed paths: - A /tags/r57-release (from /trunk:56) - -Tag as r57-release ------------------------------------------------------------------------- -r56 | nevcairiel | 2016-07-20 21:22:30 +0000 (Wed, 20 Jul 2016) | 1 line -Changed paths: - M /trunk/.pkgmeta - M /trunk/AceGUI-3.0-SharedMediaWidgets/prototypes.lua - M /trunk/AceGUI-3.0-SharedMediaWidgets.toc - -Properly embed LibSharedMedia-3.0 for stand-alone builds ------------------------------------------------------------------------- -r54 | nevcairiel | 2016-07-19 06:34:58 +0000 (Tue, 19 Jul 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0-SharedMediaWidgets.toc - -Update TOC to 7.0 ------------------------------------------------------------------------- -r53 | nevcairiel | 2016-06-03 06:51:46 +0000 (Fri, 03 Jun 2016) | 1 line -Changed paths: - M /trunk/AceGUI-3.0-SharedMediaWidgets/prototypes.lua - -Remove SetPoint to UIParent, AceGUI-3.0 will properly position the element when its used ------------------------------------------------------------------------- diff --git a/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.lua b/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.lua deleted file mode 100755 index efdb6cb..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.lua +++ /dev/null @@ -1,1000 +0,0 @@ ---- **AceGUI-3.0** provides access to numerous widgets which can be used to create GUIs. --- AceGUI is used by AceConfigDialog to create the option GUIs, but you can use it by itself --- to create any custom GUI. There are more extensive examples in the test suite in the Ace3 --- stand-alone distribution. --- --- **Note**: When using AceGUI-3.0 directly, please do not modify the frames of the widgets directly, --- as any "unknown" change to the widgets will cause addons that get your widget out of the widget pool --- to misbehave. If you think some part of a widget should be modifiable, please open a ticket, and we"ll --- implement a proper API to modify it. --- @usage --- local AceGUI = LibStub("AceGUI-3.0") --- -- Create a container frame --- local f = AceGUI:Create("Frame") --- f:SetCallback("OnClose",function(widget) AceGUI:Release(widget) end) --- f:SetTitle("AceGUI-3.0 Example") --- f:SetStatusText("Status Bar") --- f:SetLayout("Flow") --- -- Create a button --- local btn = AceGUI:Create("Button") --- btn:SetWidth(170) --- btn:SetText("Button !") --- btn:SetCallback("OnClick", function() print("Click!") end) --- -- Add the button to the container --- f:AddChild(btn) --- @class file --- @name AceGUI-3.0 --- @release $Id: AceGUI-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $ -local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 36 -local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR) - -if not AceGUI then return end -- No upgrade needed - --- Lua APIs -local tinsert = table.insert -local select, pairs, next, type = select, pairs, next, type -local error, assert = error, assert -local setmetatable, rawget = setmetatable, rawget -local math_max = math.max - --- WoW APIs -local UIParent = UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: geterrorhandler, LibStub - ---local con = LibStub("AceConsole-3.0",true) - -AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {} -AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {} -AceGUI.WidgetBase = AceGUI.WidgetBase or {} -AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {} -AceGUI.WidgetVersions = AceGUI.WidgetVersions or {} - --- local upvalues -local WidgetRegistry = AceGUI.WidgetRegistry -local LayoutRegistry = AceGUI.LayoutRegistry -local WidgetVersions = AceGUI.WidgetVersions - ---[[ - xpcall safecall implementation -]] -local xpcall = xpcall - -local function errorhandler(err) - return geterrorhandler()(err) -end - -local function safecall(func, ...) - if func then - return xpcall(func, errorhandler, ...) - end -end - --- Recycling functions -local newWidget, delWidget -do - -- Version Upgrade in Minor 29 - -- Internal Storage of the objects changed, from an array table - -- to a hash table, and additionally we introduced versioning on - -- the widgets which would discard all widgets from a pre-29 version - -- anyway, so we just clear the storage now, and don't try to - -- convert the storage tables to the new format. - -- This should generally not cause *many* widgets to end up in trash, - -- since once dialogs are opened, all addons should be loaded already - -- and AceGUI should be on the latest version available on the users - -- setup. - -- -- nevcairiel - Nov 2nd, 2009 - if oldminor and oldminor < 29 and AceGUI.objPools then - AceGUI.objPools = nil - end - - AceGUI.objPools = AceGUI.objPools or {} - local objPools = AceGUI.objPools - --Returns a new instance, if none are available either returns a new table or calls the given contructor - function newWidget(type) - if not WidgetRegistry[type] then - error("Attempt to instantiate unknown widget type", 2) - end - - if not objPools[type] then - objPools[type] = {} - end - - local newObj = next(objPools[type]) - if not newObj then - newObj = WidgetRegistry[type]() - newObj.AceGUIWidgetVersion = WidgetVersions[type] - else - objPools[type][newObj] = nil - -- if the widget is older then the latest, don't even try to reuse it - -- just forget about it, and grab a new one. - if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then - return newWidget(type) - end - end - return newObj - end - -- Releases an instance to the Pool - function delWidget(obj,type) - if not objPools[type] then - objPools[type] = {} - end - if objPools[type][obj] then - error("Attempt to Release Widget that is already released", 2) - end - objPools[type][obj] = true - end -end - - -------------------- --- API Functions -- -------------------- - --- Gets a widget Object - ---- Create a new Widget of the given type. --- This function will instantiate a new widget (or use one from the widget pool), and call the --- OnAcquire function on it, before returning. --- @param type The type of the widget. --- @return The newly created widget. -function AceGUI:Create(type) - if WidgetRegistry[type] then - local widget = newWidget(type) - - if rawget(widget, "Acquire") then - widget.OnAcquire = widget.Acquire - widget.Acquire = nil - elseif rawget(widget, "Aquire") then - widget.OnAcquire = widget.Aquire - widget.Aquire = nil - end - - if rawget(widget, "Release") then - widget.OnRelease = rawget(widget, "Release") - widget.Release = nil - end - - if widget.OnAcquire then - widget:OnAcquire() - else - error(("Widget type %s doesn't supply an OnAcquire Function"):format(type)) - end - -- Set the default Layout ("List") - safecall(widget.SetLayout, widget, "List") - safecall(widget.ResumeLayout, widget) - return widget - end -end - ---- Releases a widget Object. --- This function calls OnRelease on the widget and places it back in the widget pool. --- Any data on the widget is being erased, and the widget will be hidden.\\ --- If this widget is a Container-Widget, all of its Child-Widgets will be releases as well. --- @param widget The widget to release -function AceGUI:Release(widget) - safecall(widget.PauseLayout, widget) - widget:Fire("OnRelease") - safecall(widget.ReleaseChildren, widget) - - if widget.OnRelease then - widget:OnRelease() --- else --- error(("Widget type %s doesn't supply an OnRelease Function"):format(widget.type)) - end - for k in pairs(widget.userdata) do - widget.userdata[k] = nil - end - for k in pairs(widget.events) do - widget.events[k] = nil - end - widget.width = nil - widget.relWidth = nil - widget.height = nil - widget.relHeight = nil - widget.noAutoHeight = nil - widget.frame:ClearAllPoints() - widget.frame:Hide() - widget.frame:SetParent(UIParent) - widget.frame.width = nil - widget.frame.height = nil - if widget.content then - widget.content.width = nil - widget.content.height = nil - end - delWidget(widget, widget.type) -end - ------------ --- Focus -- ------------ - - ---- Called when a widget has taken focus. --- e.g. Dropdowns opening, Editboxes gaining kb focus --- @param widget The widget that should be focused -function AceGUI:SetFocus(widget) - if self.FocusedWidget and self.FocusedWidget ~= widget then - safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) - end - self.FocusedWidget = widget -end - - ---- Called when something has happened that could cause widgets with focus to drop it --- e.g. titlebar of a frame being clicked -function AceGUI:ClearFocus() - if self.FocusedWidget then - safecall(self.FocusedWidget.ClearFocus, self.FocusedWidget) - self.FocusedWidget = nil - end -end - -------------- --- Widgets -- -------------- ---[[ - Widgets must provide the following functions - OnAcquire() - Called when the object is acquired, should set everything to a default hidden state - - And the following members - frame - the frame or derivitive object that will be treated as the widget for size and anchoring purposes - type - the type of the object, same as the name given to :RegisterWidget() - - Widgets contain a table called userdata, this is a safe place to store data associated with the wigdet - It will be cleared automatically when a widget is released - Placing values directly into a widget object should be avoided - - If the Widget can act as a container for other Widgets the following - content - frame or derivitive that children will be anchored to - - The Widget can supply the following Optional Members - :OnRelease() - Called when the object is Released, should remove any additional anchors and clear any data - :OnWidthSet(width) - Called when the width of the widget is changed - :OnHeightSet(height) - Called when the height of the widget is changed - Widgets should not use the OnSizeChanged events of thier frame or content members, use these methods instead - AceGUI already sets a handler to the event - :LayoutFinished(width, height) - called after a layout has finished, the width and height will be the width and height of the - area used for controls. These can be nil if the layout used the existing size to layout the controls. - -]] - --------------------------- --- Widget Base Template -- --------------------------- -do - local WidgetBase = AceGUI.WidgetBase - - WidgetBase.SetParent = function(self, parent) - local frame = self.frame - frame:SetParent(nil) - frame:SetParent(parent.content) - self.parent = parent - end - - WidgetBase.SetCallback = function(self, name, func) - if type(func) == "function" then - self.events[name] = func - end - end - - WidgetBase.Fire = function(self, name, ...) - if self.events[name] then - local success, ret = safecall(self.events[name], self, name, ...) - if success then - return ret - end - end - end - - WidgetBase.SetWidth = function(self, width) - self.frame:SetWidth(width) - self.frame.width = width - if self.OnWidthSet then - self:OnWidthSet(width) - end - end - - WidgetBase.SetRelativeWidth = function(self, width) - if width <= 0 or width > 1 then - error(":SetRelativeWidth(width): Invalid relative width.", 2) - end - self.relWidth = width - self.width = "relative" - end - - WidgetBase.SetHeight = function(self, height) - self.frame:SetHeight(height) - self.frame.height = height - if self.OnHeightSet then - self:OnHeightSet(height) - end - end - - --[[ WidgetBase.SetRelativeHeight = function(self, height) - if height <= 0 or height > 1 then - error(":SetRelativeHeight(height): Invalid relative height.", 2) - end - self.relHeight = height - self.height = "relative" - end ]] - - WidgetBase.IsVisible = function(self) - return self.frame:IsVisible() - end - - WidgetBase.IsShown= function(self) - return self.frame:IsShown() - end - - WidgetBase.Release = function(self) - AceGUI:Release(self) - end - - WidgetBase.SetPoint = function(self, ...) - return self.frame:SetPoint(...) - end - - WidgetBase.ClearAllPoints = function(self) - return self.frame:ClearAllPoints() - end - - WidgetBase.GetNumPoints = function(self) - return self.frame:GetNumPoints() - end - - WidgetBase.GetPoint = function(self, ...) - return self.frame:GetPoint(...) - end - - WidgetBase.GetUserDataTable = function(self) - return self.userdata - end - - WidgetBase.SetUserData = function(self, key, value) - self.userdata[key] = value - end - - WidgetBase.GetUserData = function(self, key) - return self.userdata[key] - end - - WidgetBase.IsFullHeight = function(self) - return self.height == "fill" - end - - WidgetBase.SetFullHeight = function(self, isFull) - if isFull then - self.height = "fill" - else - self.height = nil - end - end - - WidgetBase.IsFullWidth = function(self) - return self.width == "fill" - end - - WidgetBase.SetFullWidth = function(self, isFull) - if isFull then - self.width = "fill" - else - self.width = nil - end - end - --- local function LayoutOnUpdate(this) --- this:SetScript("OnUpdate",nil) --- this.obj:PerformLayout() --- end - - local WidgetContainerBase = AceGUI.WidgetContainerBase - - WidgetContainerBase.PauseLayout = function(self) - self.LayoutPaused = true - end - - WidgetContainerBase.ResumeLayout = function(self) - self.LayoutPaused = nil - end - - WidgetContainerBase.PerformLayout = function(self) - if self.LayoutPaused then - return - end - safecall(self.LayoutFunc, self.content, self.children) - end - - --call this function to layout, makes sure layed out objects get a frame to get sizes etc - WidgetContainerBase.DoLayout = function(self) - self:PerformLayout() --- if not self.parent then --- self.frame:SetScript("OnUpdate", LayoutOnUpdate) --- end - end - - WidgetContainerBase.AddChild = function(self, child, beforeWidget) - if beforeWidget then - local siblingIndex = 1 - for _, widget in pairs(self.children) do - if widget == beforeWidget then - break - end - siblingIndex = siblingIndex + 1 - end - tinsert(self.children, siblingIndex, child) - else - tinsert(self.children, child) - end - child:SetParent(self) - child.frame:Show() - self:DoLayout() - end - - WidgetContainerBase.AddChildren = function(self, ...) - for i = 1, select("#", ...) do - local child = select(i, ...) - tinsert(self.children, child) - child:SetParent(self) - child.frame:Show() - end - self:DoLayout() - end - - WidgetContainerBase.ReleaseChildren = function(self) - local children = self.children - for i = 1,#children do - AceGUI:Release(children[i]) - children[i] = nil - end - end - - WidgetContainerBase.SetLayout = function(self, Layout) - self.LayoutFunc = AceGUI:GetLayout(Layout) - end - - WidgetContainerBase.SetAutoAdjustHeight = function(self, adjust) - if adjust then - self.noAutoHeight = nil - else - self.noAutoHeight = true - end - end - - local function FrameResize(this) - local self = this.obj - if this:GetWidth() and this:GetHeight() then - if self.OnWidthSet then - self:OnWidthSet(this:GetWidth()) - end - if self.OnHeightSet then - self:OnHeightSet(this:GetHeight()) - end - end - end - - local function ContentResize(this) - if this:GetWidth() and this:GetHeight() then - this.width = this:GetWidth() - this.height = this:GetHeight() - this.obj:DoLayout() - end - end - - setmetatable(WidgetContainerBase, {__index=WidgetBase}) - - --One of these function should be called on each Widget Instance as part of its creation process - - --- Register a widget-class as a container for newly created widgets. - -- @param widget The widget class - function AceGUI:RegisterAsContainer(widget) - widget.children = {} - widget.userdata = {} - widget.events = {} - widget.base = WidgetContainerBase - widget.content.obj = widget - widget.frame.obj = widget - widget.content:SetScript("OnSizeChanged", ContentResize) - widget.frame:SetScript("OnSizeChanged", FrameResize) - setmetatable(widget, {__index = WidgetContainerBase}) - widget:SetLayout("List") - return widget - end - - --- Register a widget-class as a widget. - -- @param widget The widget class - function AceGUI:RegisterAsWidget(widget) - widget.userdata = {} - widget.events = {} - widget.base = WidgetBase - widget.frame.obj = widget - widget.frame:SetScript("OnSizeChanged", FrameResize) - setmetatable(widget, {__index = WidgetBase}) - return widget - end -end - - - - ------------------- --- Widget API -- ------------------- - ---- Registers a widget Constructor, this function returns a new instance of the Widget --- @param Name The name of the widget --- @param Constructor The widget constructor function --- @param Version The version of the widget -function AceGUI:RegisterWidgetType(Name, Constructor, Version) - assert(type(Constructor) == "function") - assert(type(Version) == "number") - - local oldVersion = WidgetVersions[Name] - if oldVersion and oldVersion >= Version then return end - - WidgetVersions[Name] = Version - WidgetRegistry[Name] = Constructor -end - ---- Registers a Layout Function --- @param Name The name of the layout --- @param LayoutFunc Reference to the layout function -function AceGUI:RegisterLayout(Name, LayoutFunc) - assert(type(LayoutFunc) == "function") - if type(Name) == "string" then - Name = Name:upper() - end - LayoutRegistry[Name] = LayoutFunc -end - ---- Get a Layout Function from the registry --- @param Name The name of the layout -function AceGUI:GetLayout(Name) - if type(Name) == "string" then - Name = Name:upper() - end - return LayoutRegistry[Name] -end - -AceGUI.counts = AceGUI.counts or {} - ---- A type-based counter to count the number of widgets created. --- This is used by widgets that require a named frame, e.g. when a Blizzard --- Template requires it. --- @param type The widget type -function AceGUI:GetNextWidgetNum(type) - if not self.counts[type] then - self.counts[type] = 0 - end - self.counts[type] = self.counts[type] + 1 - return self.counts[type] -end - ---- Return the number of created widgets for this type. --- In contrast to GetNextWidgetNum, the number is not incremented. --- @param type The widget type -function AceGUI:GetWidgetCount(type) - return self.counts[type] or 0 -end - ---- Return the version of the currently registered widget type. --- @param type The widget type -function AceGUI:GetWidgetVersion(type) - return WidgetVersions[type] -end - -------------- --- Layouts -- -------------- - ---[[ - A Layout is a func that takes 2 parameters - content - the frame that widgets will be placed inside - children - a table containing the widgets to layout -]] - --- Very simple Layout, Children are stacked on top of each other down the left side -AceGUI:RegisterLayout("List", - function(content, children) - local height = 0 - local width = content.width or content:GetWidth() or 0 - for i = 1, #children do - local child = children[i] - - local frame = child.frame - frame:ClearAllPoints() - frame:Show() - if i == 1 then - frame:SetPoint("TOPLEFT", content) - else - frame:SetPoint("TOPLEFT", children[i-1].frame, "BOTTOMLEFT") - end - - if child.width == "fill" then - child:SetWidth(width) - frame:SetPoint("RIGHT", content) - - if child.DoLayout then - child:DoLayout() - end - elseif child.width == "relative" then - child:SetWidth(width * child.relWidth) - - if child.DoLayout then - child:DoLayout() - end - end - - height = height + (frame.height or frame:GetHeight() or 0) - end - safecall(content.obj.LayoutFinished, content.obj, nil, height) - end) - --- A single control fills the whole content area -AceGUI:RegisterLayout("Fill", - function(content, children) - if children[1] then - children[1]:SetWidth(content:GetWidth() or 0) - children[1]:SetHeight(content:GetHeight() or 0) - children[1].frame:SetAllPoints(content) - children[1].frame:Show() - safecall(content.obj.LayoutFinished, content.obj, nil, children[1].frame:GetHeight()) - end - end) - -local layoutrecursionblock = nil -local function safelayoutcall(object, func, ...) - layoutrecursionblock = true - object[func](object, ...) - layoutrecursionblock = nil -end - -AceGUI:RegisterLayout("Flow", - function(content, children) - if layoutrecursionblock then return end - --used height so far - local height = 0 - --width used in the current row - local usedwidth = 0 - --height of the current row - local rowheight = 0 - local rowoffset = 0 - - local width = content.width or content:GetWidth() or 0 - - --control at the start of the row - local rowstart - local rowstartoffset - local isfullheight - - local frameoffset - local lastframeoffset - local oversize - for i = 1, #children do - local child = children[i] - oversize = nil - local frame = child.frame - local frameheight = frame.height or frame:GetHeight() or 0 - local framewidth = frame.width or frame:GetWidth() or 0 - lastframeoffset = frameoffset - -- HACK: Why did we set a frameoffset of (frameheight / 2) ? - -- That was moving all widgets half the widgets size down, is that intended? - -- Actually, it seems to be neccessary for many cases, we'll leave it in for now. - -- If widgets seem to anchor weirdly with this, provide a valid alignoffset for them. - -- TODO: Investigate moar! - frameoffset = child.alignoffset or (frameheight / 2) - - if child.width == "relative" then - framewidth = width * child.relWidth - end - - frame:Show() - frame:ClearAllPoints() - if i == 1 then - -- anchor the first control to the top left - frame:SetPoint("TOPLEFT", content) - rowheight = frameheight - rowoffset = frameoffset - rowstart = frame - rowstartoffset = frameoffset - usedwidth = framewidth - if usedwidth > width then - oversize = true - end - else - -- if there isn't available width for the control start a new row - -- if a control is "fill" it will be on a row of its own full width - if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then - if isfullheight then - -- a previous row has already filled the entire height, there's nothing we can usefully do anymore - -- (maybe error/warn about this?) - break - end - --anchor the previous row, we will now know its height and offset - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) - height = height + rowheight + 3 - --save this as the rowstart so we can anchor it after the row is complete and we have the max height and offset of controls in it - rowstart = frame - rowstartoffset = frameoffset - rowheight = frameheight - rowoffset = frameoffset - usedwidth = framewidth - if usedwidth > width then - oversize = true - end - -- put the control on the current row, adding it to the width and checking if the height needs to be increased - else - --handles cases where the new height is higher than either control because of the offsets - --math.max(rowheight-rowoffset+frameoffset, frameheight-frameoffset+rowoffset) - - --offset is always the larger of the two offsets - rowoffset = math_max(rowoffset, frameoffset) - rowheight = math_max(rowheight, rowoffset + (frameheight / 2)) - - frame:SetPoint("TOPLEFT", children[i-1].frame, "TOPRIGHT", 0, frameoffset - lastframeoffset) - usedwidth = framewidth + usedwidth - end - end - - if child.width == "fill" then - safelayoutcall(child, "SetWidth", width) - frame:SetPoint("RIGHT", content) - - usedwidth = 0 - rowstart = frame - rowstartoffset = frameoffset - - if child.DoLayout then - child:DoLayout() - end - rowheight = frame.height or frame:GetHeight() or 0 - rowoffset = child.alignoffset or (rowheight / 2) - rowstartoffset = rowoffset - elseif child.width == "relative" then - safelayoutcall(child, "SetWidth", width * child.relWidth) - - if child.DoLayout then - child:DoLayout() - end - elseif oversize then - if width > 1 then - frame:SetPoint("RIGHT", content) - end - end - - if child.height == "fill" then - frame:SetPoint("BOTTOM", content) - isfullheight = true - end - end - - --anchor the last row, if its full height needs a special case since its height has just been changed by the anchor - if isfullheight then - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -height) - elseif rowstart then - rowstart:SetPoint("TOPLEFT", content, "TOPLEFT", 0, -(height + (rowoffset - rowstartoffset) + 3)) - end - - height = height + rowheight + 3 - safecall(content.obj.LayoutFinished, content.obj, nil, height) - end) - --- Get alignment method and value. Possible alignment methods are a callback, a number, "start", "middle", "end", "fill" or "TOPLEFT", "BOTTOMRIGHT" etc. -local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child) - local fn = cellObj and (cellObj["align" .. dir] or cellObj.align) - or colObj and (colObj["align" .. dir] or colObj.align) - or tableObj["align" .. dir] or tableObj.align - or "CENTERLEFT" - local child, cell, val = child or 0, cell or 0, nil - - if type(fn) == "string" then - fn = fn:lower() - fn = dir == "V" and (fn:sub(1, 3) == "top" and "start" or fn:sub(1, 6) == "bottom" and "end" or fn:sub(1, 6) == "center" and "middle") - or dir == "H" and (fn:sub(-4) == "left" and "start" or fn:sub(-5) == "right" and "end" or fn:sub(-6) == "center" and "middle") - or fn - val = (fn == "start" or fn == "fill") and 0 or fn == "end" and cell - child or (cell - child) / 2 - elseif type(fn) == "function" then - val = fn(child or 0, cell, dir) - else - val = fn - end - - return fn, max(0, min(val, cell)) -end - --- Get width or height for multiple cells combined -local GetCellDimension = function (dir, laneDim, from, to, space) - local dim = 0 - for cell=from,to do - dim = dim + (laneDim[cell] or 0) - end - return dim + max(0, to - from) * (space or 0) -end - ---[[ Options -============ -Container: - - columns ({col, col, ...}): Column settings. "col" can be a number (<= 0: content width, <1: rel. width, <10: weight, >=10: abs. width) or a table with column setting. - - space, spaceH, spaceV: Overall, horizontal and vertical spacing between cells. - - align, alignH, alignV: Overall, horizontal and vertical cell alignment. See GetCellAlign() for possible values. -Columns: - - width: Fixed column width (nil or <=0: content width, <1: rel. width, >=1: abs. width). - - min or 1: Min width for content based width - - max or 2: Max width for content based width - - weight: Flexible column width. The leftover width after accounting for fixed-width columns is distributed to weighted columns according to their weights. - - align, alignH, alignV: Overwrites the container setting for alignment. -Cell: - - colspan: Makes a cell span multiple columns. - - rowspan: Makes a cell span multiple rows. - - align, alignH, alignV: Overwrites the container and column setting for alignment. -]] -AceGUI:RegisterLayout("Table", - function (content, children) - local obj = content.obj - obj:PauseLayout() - - local tableObj = obj:GetUserData("table") - local cols = tableObj.columns - local spaceH = tableObj.spaceH or tableObj.space or 0 - local spaceV = tableObj.spaceV or tableObj.space or 0 - local totalH = (content:GetWidth() or content.width or 0) - spaceH * (#cols - 1) - - -- We need to reuse these because layout events can come in very frequently - local layoutCache = obj:GetUserData("layoutCache") - if not layoutCache then - layoutCache = {{}, {}, {}, {}, {}, {}} - obj:SetUserData("layoutCache", layoutCache) - end - local t, laneH, laneV, rowspans, rowStart, colStart = unpack(layoutCache) - - -- Create the grid - local n, slotFound = 0 - for i,child in ipairs(children) do - if child:IsShown() then - repeat - n = n + 1 - local col = (n - 1) % #cols + 1 - local row = ceil(n / #cols) - local rowspan = rowspans[col] - local cell = rowspan and rowspan.child or child - local cellObj = cell:GetUserData("cell") - slotFound = not rowspan - - -- Rowspan - if not rowspan and cellObj and cellObj.rowspan then - rowspan = {child = child, from = row, to = row + cellObj.rowspan - 1} - rowspans[col] = rowspan - end - if rowspan and i == #children then - rowspan.to = row - end - - -- Colspan - local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col)) - n = n + colspan - - -- Place the cell - if not rowspan or rowspan.to == row then - t[n] = cell - rowStart[cell] = rowspan and rowspan.from or row - colStart[cell] = col - - if rowspan then - rowspans[col] = nil - end - end - until slotFound - end - end - - local rows = ceil(n / #cols) - - -- Determine fixed size cols and collect weights - local extantH, totalWeight = totalH, 0 - for col,colObj in ipairs(cols) do - laneH[col] = 0 - - if type(colObj) == "number" then - colObj = {[colObj >= 1 and colObj < 10 and "weight" or "width"] = colObj} - cols[col] = colObj - end - - if colObj.weight then - -- Weight - totalWeight = totalWeight + (colObj.weight or 1) - else - if not colObj.width or colObj.width <= 0 then - -- Content width - for row=1,rows do - local child = t[(row - 1) * #cols + col] - if child then - local f = child.frame - f:ClearAllPoints() - local childH = f:GetWidth() or 0 - - laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH)) - end - end - - laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col])) - else - -- Rel./Abs. width - laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width - end - extantH = max(0, extantH - laneH[col]) - end - end - - -- Determine sizes based on weight - local scale = totalWeight > 0 and extantH / totalWeight or 0 - for col,colObj in pairs(cols) do - if colObj.weight then - laneH[col] = scale * colObj.weight - end - end - - -- Arrange children - for row=1,rows do - local rowV = 0 - - -- Horizontal placement and sizing - for col=1,#cols do - local child = t[(row - 1) * #cols + col] - if child then - local colObj = cols[colStart[child]] - local cellObj = child:GetUserData("cell") - local offsetH = GetCellDimension("H", laneH, 1, colStart[child] - 1, spaceH) + (colStart[child] == 1 and 0 or spaceH) - local cellH = GetCellDimension("H", laneH, colStart[child], col, spaceH) - - local f = child.frame - f:ClearAllPoints() - local childH = f:GetWidth() or 0 - - local alignFn, align = GetCellAlign("H", tableObj, colObj, cellObj, cellH, childH) - f:SetPoint("LEFT", content, offsetH + align, 0) - if child:IsFullWidth() or alignFn == "fill" or childH > cellH then - f:SetPoint("RIGHT", content, "LEFT", offsetH + align + cellH, 0) - end - - if child.DoLayout then - child:DoLayout() - end - - rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV)) - end - end - - laneV[row] = rowV - - -- Vertical placement and sizing - for col=1,#cols do - local child = t[(row - 1) * #cols + col] - if child then - local colObj = cols[colStart[child]] - local cellObj = child:GetUserData("cell") - local offsetV = GetCellDimension("V", laneV, 1, rowStart[child] - 1, spaceV) + (rowStart[child] == 1 and 0 or spaceV) - local cellV = GetCellDimension("V", laneV, rowStart[child], row, spaceV) - - local f = child.frame - local childV = f:GetHeight() or 0 - - local alignFn, align = GetCellAlign("V", tableObj, colObj, cellObj, cellV, childV) - if child:IsFullHeight() or alignFn == "fill" then - f:SetHeight(cellV) - end - f:SetPoint("TOP", content, 0, -(offsetV + align)) - end - end - end - - -- Calculate total height - local totalV = GetCellDimension("V", laneV, 1, #laneV, spaceV) - - -- Cleanup - for _,v in pairs(layoutCache) do wipe(v) end - - safecall(obj.LayoutFinished, obj, nil, totalV) - obj:ResumeLayout() - end) diff --git a/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.xml b/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.xml deleted file mode 100755 index ae22c90..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/AceGUI-3.0.xml +++ /dev/null @@ -1,28 +0,0 @@ -<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"> - <Script file="AceGUI-3.0.lua"/> - <!-- Container --> - <Script file="widgets\AceGUIContainer-BlizOptionsGroup.lua"/> - <Script file="widgets\AceGUIContainer-DropDownGroup.lua"/> - <Script file="widgets\AceGUIContainer-Frame.lua"/> - <Script file="widgets\AceGUIContainer-InlineGroup.lua"/> - <Script file="widgets\AceGUIContainer-ScrollFrame.lua"/> - <Script file="widgets\AceGUIContainer-SimpleGroup.lua"/> - <Script file="widgets\AceGUIContainer-TabGroup.lua"/> - <Script file="widgets\AceGUIContainer-TreeGroup.lua"/> - <Script file="widgets\AceGUIContainer-Window.lua"/> - <!-- Widgets --> - <Script file="widgets\AceGUIWidget-Button.lua"/> - <Script file="widgets\AceGUIWidget-CheckBox.lua"/> - <Script file="widgets\AceGUIWidget-ColorPicker.lua"/> - <Script file="widgets\AceGUIWidget-DropDown.lua"/> - <Script file="widgets\AceGUIWidget-DropDown-Items.lua"/> - <Script file="widgets\AceGUIWidget-EditBox.lua"/> - <Script file="widgets\AceGUIWidget-Heading.lua"/> - <Script file="widgets\AceGUIWidget-Icon.lua"/> - <Script file="widgets\AceGUIWidget-InteractiveLabel.lua"/> - <Script file="widgets\AceGUIWidget-Keybinding.lua"/> - <Script file="widgets\AceGUIWidget-Label.lua"/> - <Script file="widgets\AceGUIWidget-MultiLineEditBox.lua"/> - <Script file="widgets\AceGUIWidget-Slider.lua"/> -</Ui> diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua deleted file mode 100755 index 200fc71..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua +++ /dev/null @@ -1,138 +0,0 @@ ---[[----------------------------------------------------------------------------- -BlizOptionsGroup Container -Simple container widget for the integration of AceGUI into the Blizzard Interface Options --------------------------------------------------------------------------------]] -local Type, Version = "BlizOptionsGroup", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame = CreateFrame - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] - -local function OnShow(frame) - frame.obj:Fire("OnShow") -end - -local function OnHide(frame) - frame.obj:Fire("OnHide") -end - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] - -local function okay(frame) - frame.obj:Fire("okay") -end - -local function cancel(frame) - frame.obj:Fire("cancel") -end - -local function default(frame) - frame.obj:Fire("default") -end - -local function refresh(frame) - frame.obj:Fire("refresh") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] - -local methods = { - ["OnAcquire"] = function(self) - self:SetName() - self:SetTitle() - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 63 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 26 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetName"] = function(self, name, parent) - self.frame.name = name - self.frame.parent = parent - end, - - ["SetTitle"] = function(self, title) - local content = self.content - content:ClearAllPoints() - if not title or title == "" then - content:SetPoint("TOPLEFT", 10, -10) - self.label:SetText("") - else - content:SetPoint("TOPLEFT", 10, -40) - self.label:SetText(title) - end - content:SetPoint("BOTTOMRIGHT", -10, 10) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame") - frame:Hide() - - -- support functions for the Blizzard Interface Options - frame.okay = okay - frame.cancel = cancel - frame.default = default - frame.refresh = refresh - - frame:SetScript("OnHide", OnHide) - frame:SetScript("OnShow", OnShow) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge") - label:SetPoint("TOPLEFT", 10, -15) - label:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", 10, -45) - label:SetJustifyH("LEFT") - label:SetJustifyV("TOP") - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - label = label, - frame = frame, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua deleted file mode 100755 index aacb0fc..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua +++ /dev/null @@ -1,157 +0,0 @@ ---[[----------------------------------------------------------------------------- -DropdownGroup Container -Container controlled by a dropdown on the top. --------------------------------------------------------------------------------]] -local Type, Version = "DropdownGroup", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local assert, pairs, type = assert, pairs, type - --- WoW APIs -local CreateFrame = CreateFrame - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function SelectedGroup(self, event, value) - local group = self.parentgroup - local status = group.status or group.localstatus - status.selected = value - self.parentgroup:Fire("OnGroupSelected", value) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.dropdown:SetText("") - self:SetDropdownWidth(200) - self:SetTitle("") - end, - - ["OnRelease"] = function(self) - self.dropdown.list = nil - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - end, - - ["SetTitle"] = function(self, title) - self.titletext:SetText(title) - self.dropdown.frame:ClearAllPoints() - if title and title ~= "" then - self.dropdown.frame:SetPoint("TOPRIGHT", -2, 0) - else - self.dropdown.frame:SetPoint("TOPLEFT", -1, 0) - end - end, - - ["SetGroupList"] = function(self,list,order) - self.dropdown:SetList(list,order) - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - end, - - ["SetGroup"] = function(self,group) - self.dropdown:SetValue(group) - local status = self.status or self.localstatus - status.selected = group - self:Fire("OnGroupSelected", group) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 26 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 63 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["LayoutFinished"] = function(self, width, height) - self:SetHeight((height or 0) + 63) - end, - - ["SetDropdownWidth"] = function(self, width) - self.dropdown:SetWidth(width) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame") - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOPLEFT", 4, -5) - titletext:SetPoint("TOPRIGHT", -4, -5) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - - local dropdown = AceGUI:Create("Dropdown") - dropdown.frame:SetParent(frame) - dropdown.frame:SetFrameLevel(dropdown.frame:GetFrameLevel() + 2) - dropdown:SetCallback("OnValueChanged", SelectedGroup) - dropdown.frame:SetPoint("TOPLEFT", -1, 0) - dropdown.frame:Show() - dropdown:SetLabel("") - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 0, -26) - border:SetPoint("BOTTOMRIGHT", 0, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1,0.1,0.1,0.5) - border:SetBackdropBorderColor(0.4,0.4,0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - localstatus = {}, - titletext = titletext, - dropdown = dropdown, - border = border, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - dropdown.parentgroup = widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua deleted file mode 100755 index aff1416..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua +++ /dev/null @@ -1,316 +0,0 @@ ---[[----------------------------------------------------------------------------- -Frame Container --------------------------------------------------------------------------------]] -local Type, Version = "Frame", 26 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, assert, type = pairs, assert, type -local wipe = table.wipe - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Button_OnClick(frame) - PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT - frame.obj:Hide() -end - -local function Frame_OnShow(frame) - frame.obj:Fire("OnShow") -end - -local function Frame_OnClose(frame) - frame.obj:Fire("OnClose") -end - -local function Frame_OnMouseDown(frame) - AceGUI:ClearFocus() -end - -local function Title_OnMouseDown(frame) - frame:GetParent():StartMoving() - AceGUI:ClearFocus() -end - -local function MoverSizer_OnMouseUp(mover) - local frame = mover:GetParent() - frame:StopMovingOrSizing() - local self = frame.obj - local status = self.status or self.localstatus - status.width = frame:GetWidth() - status.height = frame:GetHeight() - status.top = frame:GetTop() - status.left = frame:GetLeft() -end - -local function SizerSE_OnMouseDown(frame) - frame:GetParent():StartSizing("BOTTOMRIGHT") - AceGUI:ClearFocus() -end - -local function SizerS_OnMouseDown(frame) - frame:GetParent():StartSizing("BOTTOM") - AceGUI:ClearFocus() -end - -local function SizerE_OnMouseDown(frame) - frame:GetParent():StartSizing("RIGHT") - AceGUI:ClearFocus() -end - -local function StatusBar_OnEnter(frame) - frame.obj:Fire("OnEnterStatusBar") -end - -local function StatusBar_OnLeave(frame) - frame.obj:Fire("OnLeaveStatusBar") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.frame:SetParent(UIParent) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") - self:SetTitle() - self:SetStatusText() - self:ApplyStatus() - self:Show() - self:EnableResize(true) - end, - - ["OnRelease"] = function(self) - self.status = nil - wipe(self.localstatus) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 34 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 57 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetTitle"] = function(self, title) - self.titletext:SetText(title) - self.titlebg:SetWidth((self.titletext:GetWidth() or 0) + 10) - end, - - ["SetStatusText"] = function(self, text) - self.statustext:SetText(text) - end, - - ["Hide"] = function(self) - self.frame:Hide() - end, - - ["Show"] = function(self) - self.frame:Show() - end, - - ["EnableResize"] = function(self, state) - local func = state and "Show" or "Hide" - self.sizer_se[func](self.sizer_se) - self.sizer_s[func](self.sizer_s) - self.sizer_e[func](self.sizer_e) - end, - - -- called to set an external table to store status in - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - self:ApplyStatus() - end, - - ["ApplyStatus"] = function(self) - local status = self.status or self.localstatus - local frame = self.frame - self:SetWidth(status.width or 700) - self:SetHeight(status.height or 500) - frame:ClearAllPoints() - if status.top and status.left then - frame:SetPoint("TOP", UIParent, "BOTTOM", 0, status.top) - frame:SetPoint("LEFT", UIParent, "LEFT", status.left, 0) - else - frame:SetPoint("CENTER") - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local FrameBackdrop = { - bgFile = "Interface\\DialogFrame\\UI-DialogBox-Background", - edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", - tile = true, tileSize = 32, edgeSize = 32, - insets = { left = 8, right = 8, top = 8, bottom = 8 } -} - -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetMovable(true) - frame:SetResizable(true) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetBackdrop(FrameBackdrop) - frame:SetBackdropColor(0, 0, 0, 1) - frame:SetMinResize(400, 200) - frame:SetToplevel(true) - frame:SetScript("OnShow", Frame_OnShow) - frame:SetScript("OnHide", Frame_OnClose) - frame:SetScript("OnMouseDown", Frame_OnMouseDown) - - local closebutton = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") - closebutton:SetScript("OnClick", Button_OnClick) - closebutton:SetPoint("BOTTOMRIGHT", -27, 17) - closebutton:SetHeight(20) - closebutton:SetWidth(100) - closebutton:SetText(CLOSE) - - local statusbg = CreateFrame("Button", nil, frame) - statusbg:SetPoint("BOTTOMLEFT", 15, 15) - statusbg:SetPoint("BOTTOMRIGHT", -132, 15) - statusbg:SetHeight(24) - statusbg:SetBackdrop(PaneBackdrop) - statusbg:SetBackdropColor(0.1,0.1,0.1) - statusbg:SetBackdropBorderColor(0.4,0.4,0.4) - statusbg:SetScript("OnEnter", StatusBar_OnEnter) - statusbg:SetScript("OnLeave", StatusBar_OnLeave) - - local statustext = statusbg:CreateFontString(nil, "OVERLAY", "GameFontNormal") - statustext:SetPoint("TOPLEFT", 7, -2) - statustext:SetPoint("BOTTOMRIGHT", -7, 2) - statustext:SetHeight(20) - statustext:SetJustifyH("LEFT") - statustext:SetText("") - - local titlebg = frame:CreateTexture(nil, "OVERLAY") - titlebg:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header - titlebg:SetTexCoord(0.31, 0.67, 0, 0.63) - titlebg:SetPoint("TOP", 0, 12) - titlebg:SetWidth(100) - titlebg:SetHeight(40) - - local title = CreateFrame("Frame", nil, frame) - title:EnableMouse(true) - title:SetScript("OnMouseDown", Title_OnMouseDown) - title:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - title:SetAllPoints(titlebg) - - local titletext = title:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOP", titlebg, "TOP", 0, -14) - - local titlebg_l = frame:CreateTexture(nil, "OVERLAY") - titlebg_l:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header - titlebg_l:SetTexCoord(0.21, 0.31, 0, 0.63) - titlebg_l:SetPoint("RIGHT", titlebg, "LEFT") - titlebg_l:SetWidth(30) - titlebg_l:SetHeight(40) - - local titlebg_r = frame:CreateTexture(nil, "OVERLAY") - titlebg_r:SetTexture(131080) -- Interface\\DialogFrame\\UI-DialogBox-Header - titlebg_r:SetTexCoord(0.67, 0.77, 0, 0.63) - titlebg_r:SetPoint("LEFT", titlebg, "RIGHT") - titlebg_r:SetWidth(30) - titlebg_r:SetHeight(40) - - local sizer_se = CreateFrame("Frame", nil, frame) - sizer_se:SetPoint("BOTTOMRIGHT") - sizer_se:SetWidth(25) - sizer_se:SetHeight(25) - sizer_se:EnableMouse() - sizer_se:SetScript("OnMouseDown",SizerSE_OnMouseDown) - sizer_se:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") - line1:SetWidth(14) - line1:SetHeight(14) - line1:SetPoint("BOTTOMRIGHT", -8, 8) - line1:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 14/17 - line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") - line2:SetWidth(8) - line2:SetHeight(8) - line2:SetPoint("BOTTOMRIGHT", -8, 8) - line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 8/17 - line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local sizer_s = CreateFrame("Frame", nil, frame) - sizer_s:SetPoint("BOTTOMRIGHT", -25, 0) - sizer_s:SetPoint("BOTTOMLEFT") - sizer_s:SetHeight(25) - sizer_s:EnableMouse(true) - sizer_s:SetScript("OnMouseDown", SizerS_OnMouseDown) - sizer_s:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - local sizer_e = CreateFrame("Frame", nil, frame) - sizer_e:SetPoint("BOTTOMRIGHT", 0, 25) - sizer_e:SetPoint("TOPRIGHT") - sizer_e:SetWidth(25) - sizer_e:EnableMouse(true) - sizer_e:SetScript("OnMouseDown", SizerE_OnMouseDown) - sizer_e:SetScript("OnMouseUp", MoverSizer_OnMouseUp) - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT", 17, -27) - content:SetPoint("BOTTOMRIGHT", -17, 40) - - local widget = { - localstatus = {}, - titletext = titletext, - statustext = statustext, - titlebg = titlebg, - sizer_se = sizer_se, - sizer_s = sizer_s, - sizer_e = sizer_e, - content = content, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - closebutton.obj, statusbg.obj = widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua deleted file mode 100755 index 1a330ef..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua +++ /dev/null @@ -1,103 +0,0 @@ ---[[----------------------------------------------------------------------------- -InlineGroup Container -Simple container widget that creates a visible "box" with an optional title. --------------------------------------------------------------------------------]] -local Type, Version = "InlineGroup", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(300) - self:SetHeight(100) - self:SetTitle("") - end, - - -- ["OnRelease"] = nil, - - ["SetTitle"] = function(self,title) - self.titletext:SetText(title) - end, - - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 40) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 20 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - titletext:SetPoint("TOPLEFT", 14, 0) - titletext:SetPoint("TOPRIGHT", -14, 0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 0, -17) - border:SetPoint("BOTTOMRIGHT", -1, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - content = content, - titletext = titletext, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua deleted file mode 100755 index be6052f..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua +++ /dev/null @@ -1,215 +0,0 @@ ---[[----------------------------------------------------------------------------- -ScrollFrame Container -Plain container that scrolls its content and doesn't grow in height. --------------------------------------------------------------------------------]] -local Type, Version = "ScrollFrame", 26 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, assert, type = pairs, assert, type -local min, max, floor = math.min, math.max, math.floor - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function FixScrollOnUpdate(frame) - frame:SetScript("OnUpdate", nil) - frame.obj:FixScroll() -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function ScrollFrame_OnMouseWheel(frame, value) - frame.obj:MoveScroll(value) -end - -local function ScrollFrame_OnSizeChanged(frame) - frame:SetScript("OnUpdate", FixScrollOnUpdate) -end - -local function ScrollBar_OnScrollValueChanged(frame, value) - frame.obj:SetScroll(value) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetScroll(0) - self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) - end, - - ["OnRelease"] = function(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - self.scrollframe:SetPoint("BOTTOMRIGHT") - self.scrollbar:Hide() - self.scrollBarShown = nil - self.content.height, self.content.width, self.content.original_width = nil, nil, nil - end, - - ["SetScroll"] = function(self, value) - local status = self.status or self.localstatus - local viewheight = self.scrollframe:GetHeight() - local height = self.content:GetHeight() - local offset - - if viewheight > height then - offset = 0 - else - offset = floor((height - viewheight) / 1000.0 * value) - end - self.content:ClearAllPoints() - self.content:SetPoint("TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", 0, offset) - status.offset = offset - status.scrollvalue = value - end, - - ["MoveScroll"] = function(self, value) - local status = self.status or self.localstatus - local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() - - if self.scrollBarShown then - local diff = height - viewheight - local delta = 1 - if value < 0 then - delta = -1 - end - self.scrollbar:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) - end - end, - - ["FixScroll"] = function(self) - if self.updateLock then return end - self.updateLock = true - local status = self.status or self.localstatus - local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight() - local offset = status.offset or 0 - -- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys - -- No-one is going to miss 2 pixels at the bottom of the frame, anyhow! - if viewheight < height + 2 then - if self.scrollBarShown then - self.scrollBarShown = nil - self.scrollbar:Hide() - self.scrollbar:SetValue(0) - self.scrollframe:SetPoint("BOTTOMRIGHT") - if self.content.original_width then - self.content.width = self.content.original_width - end - self:DoLayout() - end - else - if not self.scrollBarShown then - self.scrollBarShown = true - self.scrollbar:Show() - self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0) - if self.content.original_width then - self.content.width = self.content.original_width - 20 - end - self:DoLayout() - end - local value = (offset / (viewheight - height) * 1000) - if value > 1000 then value = 1000 end - self.scrollbar:SetValue(value) - self:SetScroll(value) - if value < 1000 then - self.content:ClearAllPoints() - self.content:SetPoint("TOPLEFT", 0, offset) - self.content:SetPoint("TOPRIGHT", 0, offset) - status.offset = offset - end - end - self.updateLock = nil - end, - - ["LayoutFinished"] = function(self, width, height) - self.content:SetHeight(height or 0 + 20) - - -- update the scrollframe - self:FixScroll() - - -- schedule another update when everything has "settled" - self.scrollframe:SetScript("OnUpdate", FixScrollOnUpdate) - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - if not status.scrollvalue then - status.scrollvalue = 0 - end - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - content.width = width - (self.scrollBarShown and 20 or 0) - content.original_width = width - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - content.height = height - end -} ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - local num = AceGUI:GetNextWidgetNum(Type) - - local scrollframe = CreateFrame("ScrollFrame", nil, frame) - scrollframe:SetPoint("TOPLEFT") - scrollframe:SetPoint("BOTTOMRIGHT") - scrollframe:EnableMouseWheel(true) - scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel) - scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged) - - local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate") - scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16) - scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16) - scrollbar:SetMinMaxValues(0, 1000) - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - scrollbar:Hide() - -- set the script as the last step, so it doesn't fire yet - scrollbar:SetScript("OnValueChanged", ScrollBar_OnScrollValueChanged) - - local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetColorTexture(0, 0, 0, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, scrollframe) - content:SetPoint("TOPLEFT") - content:SetPoint("TOPRIGHT") - content:SetHeight(400) - scrollframe:SetScrollChild(content) - - local widget = { - localstatus = { scrollvalue = 0 }, - scrollframe = scrollframe, - scrollbar = scrollbar, - content = content, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - scrollframe.obj, scrollbar.obj = widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua deleted file mode 100755 index 6e23abc..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua +++ /dev/null @@ -1,69 +0,0 @@ ---[[----------------------------------------------------------------------------- -SimpleGroup Container -Simple container widget that just groups widgets. --------------------------------------------------------------------------------]] -local Type, Version = "SimpleGroup", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(300) - self:SetHeight(100) - end, - - -- ["OnRelease"] = nil, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight(height or 0) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - content:SetWidth(width) - content.width = width - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - content:SetHeight(height) - content.height = height - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - --Container Support - local content = CreateFrame("Frame", nil, frame) - content:SetPoint("TOPLEFT") - content:SetPoint("BOTTOMRIGHT") - - local widget = { - frame = frame, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua deleted file mode 100755 index 466fbbd..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua +++ /dev/null @@ -1,349 +0,0 @@ ---[[----------------------------------------------------------------------------- -TabGroup Container -Container that uses tabs on top to switch between groups. --------------------------------------------------------------------------------]] -local Type, Version = "TabGroup", 36 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab - --- local upvalue storage used by BuildTabs -local widths = {} -local rowwidths = {} -local rowends = {} - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function UpdateTabLook(frame) - if frame.disabled then - PanelTemplates_SetDisabledTabState(frame) - elseif frame.selected then - PanelTemplates_SelectTab(frame) - else - PanelTemplates_DeselectTab(frame) - end -end - -local function Tab_SetText(frame, text) - frame:_SetText(text) - local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0 - PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth()) -end - -local function Tab_SetSelected(frame, selected) - frame.selected = selected - UpdateTabLook(frame) -end - -local function Tab_SetDisabled(frame, disabled) - frame.disabled = disabled - UpdateTabLook(frame) -end - -local function BuildTabsOnUpdate(frame) - local self = frame.obj - self:BuildTabs() - frame:SetScript("OnUpdate", nil) -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Tab_OnClick(frame) - if not (frame.selected or frame.disabled) then - PlaySound(841) -- SOUNDKIT.IG_CHARACTER_INFO_TAB - frame.obj:SelectTab(frame.value) - end -end - -local function Tab_OnEnter(frame) - local self = frame.obj - self:Fire("OnTabEnter", self.tabs[frame.id].value, frame) -end - -local function Tab_OnLeave(frame) - local self = frame.obj - self:Fire("OnTabLeave", self.tabs[frame.id].value, frame) -end - -local function Tab_OnShow(frame) - _G[frame:GetName().."HighlightTexture"]:SetWidth(frame:GetTextWidth() + 30) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetTitle() - end, - - ["OnRelease"] = function(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - self.tablist = nil - for _, tab in pairs(self.tabs) do - tab:Hide() - end - end, - - ["CreateTab"] = function(self, id) - local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id) - local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate") - tab.obj = self - tab.id = id - - tab.text = _G[tabname .. "Text"] - tab.text:ClearAllPoints() - tab.text:SetPoint("LEFT", 14, -3) - tab.text:SetPoint("RIGHT", -12, -3) - - tab:SetScript("OnClick", Tab_OnClick) - tab:SetScript("OnEnter", Tab_OnEnter) - tab:SetScript("OnLeave", Tab_OnLeave) - tab:SetScript("OnShow", Tab_OnShow) - - tab._SetText = tab.SetText - tab.SetText = Tab_SetText - tab.SetSelected = Tab_SetSelected - tab.SetDisabled = Tab_SetDisabled - - return tab - end, - - ["SetTitle"] = function(self, text) - self.titletext:SetText(text or "") - if text and text ~= "" then - self.alignoffset = 25 - else - self.alignoffset = 18 - end - self:BuildTabs() - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - end, - - ["SelectTab"] = function(self, value) - local status = self.status or self.localstatus - local found - for i, v in ipairs(self.tabs) do - if v.value == value then - v:SetSelected(true) - found = true - else - v:SetSelected(false) - end - end - status.selected = value - if found then - self:Fire("OnGroupSelected",value) - end - end, - - ["SetTabs"] = function(self, tabs) - self.tablist = tabs - self:BuildTabs() - end, - - - ["BuildTabs"] = function(self) - local hastitle = (self.titletext:GetText() and self.titletext:GetText() ~= "") - local tablist = self.tablist - local tabs = self.tabs - - if not tablist then return end - - local width = self.frame.width or self.frame:GetWidth() or 0 - - wipe(widths) - wipe(rowwidths) - wipe(rowends) - - --Place Text into tabs and get thier initial width - for i, v in ipairs(tablist) do - local tab = tabs[i] - if not tab then - tab = self:CreateTab(i) - tabs[i] = tab - end - - tab:Show() - tab:SetText(v.text) - tab:SetDisabled(v.disabled) - tab.value = v.value - - widths[i] = tab:GetWidth() - 6 --tabs are anchored 10 pixels from the right side of the previous one to reduce spacing, but add a fixed 4px padding for the text - end - - for i = (#tablist)+1, #tabs, 1 do - tabs[i]:Hide() - end - - --First pass, find the minimum number of rows needed to hold all tabs and the initial tab layout - local numtabs = #tablist - local numrows = 1 - local usedwidth = 0 - - for i = 1, #tablist do - --If this is not the first tab of a row and there isn't room for it - if usedwidth ~= 0 and (width - usedwidth - widths[i]) < 0 then - rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px - rowends[numrows] = i - 1 - numrows = numrows + 1 - usedwidth = 0 - end - usedwidth = usedwidth + widths[i] - end - rowwidths[numrows] = usedwidth + 10 --first tab in each row takes up an extra 10px - rowends[numrows] = #tablist - - --Fix for single tabs being left on the last row, move a tab from the row above if applicable - if numrows > 1 then - --if the last row has only one tab - if rowends[numrows-1] == numtabs-1 then - --if there are more than 2 tabs in the 2nd last row - if (numrows == 2 and rowends[numrows-1] > 2) or (rowends[numrows] - rowends[numrows-1] > 2) then - --move 1 tab from the second last row to the last, if there is enough space - if (rowwidths[numrows] + widths[numtabs-1]) <= width then - rowends[numrows-1] = rowends[numrows-1] - 1 - rowwidths[numrows] = rowwidths[numrows] + widths[numtabs-1] - rowwidths[numrows-1] = rowwidths[numrows-1] - widths[numtabs-1] - end - end - end - end - - --anchor the rows as defined and resize tabs to fill thier row - local starttab = 1 - for row, endtab in ipairs(rowends) do - local first = true - for tabno = starttab, endtab do - local tab = tabs[tabno] - tab:ClearAllPoints() - if first then - tab:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 0, -(hastitle and 14 or 7)-(row-1)*20 ) - first = false - else - tab:SetPoint("LEFT", tabs[tabno-1], "RIGHT", -10, 0) - end - end - - -- equal padding for each tab to fill the available width, - -- if the used space is above 75% already - -- the 18 pixel is the typical width of a scrollbar, so we can have a tab group inside a scrolling frame, - -- and not have the tabs jump around funny when switching between tabs that need scrolling and those that don't - local padding = 0 - if not (numrows == 1 and rowwidths[1] < width*0.75 - 18) then - padding = (width - rowwidths[row]) / (endtab - starttab+1) - end - - for i = starttab, endtab do - PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth()) - end - starttab = endtab + 1 - end - - self.borderoffset = (hastitle and 17 or 10)+((numrows)*20) - self.border:SetPoint("TOPLEFT", 1, -self.borderoffset) - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local contentwidth = width - 60 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - self:BuildTabs(self) - self.frame:SetScript("OnUpdate", BuildTabsOnUpdate) - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - (self.borderoffset + 23) - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + (self.borderoffset + 23)) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame",nil,UIParent) - frame:SetHeight(100) - frame:SetWidth(100) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local titletext = frame:CreateFontString(nil,"OVERLAY","GameFontNormal") - titletext:SetPoint("TOPLEFT", 14, 0) - titletext:SetPoint("TOPRIGHT", -14, 0) - titletext:SetJustifyH("LEFT") - titletext:SetHeight(18) - titletext:SetText("") - - local border = CreateFrame("Frame", nil, frame) - border:SetPoint("TOPLEFT", 1, -27) - border:SetPoint("BOTTOMRIGHT", -1, 3) - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -7) - content:SetPoint("BOTTOMRIGHT", -10, 7) - - local widget = { - num = num, - frame = frame, - localstatus = {}, - alignoffset = 18, - titletext = titletext, - border = border, - borderoffset = 27, - tabs = {}, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua deleted file mode 100755 index 039c997..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua +++ /dev/null @@ -1,715 +0,0 @@ ---[[----------------------------------------------------------------------------- -TreeGroup Container -Container that uses a tree control to switch between groups. --------------------------------------------------------------------------------]] -local Type, Version = "TreeGroup", 41 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - -local WoW80 = select(4, GetBuildInfo()) >= 80000 - --- Lua APIs -local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type -local math_min, math_max, floor = math.min, math.max, floor -local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE - --- Recycling functions -local new, del -do - local pool = setmetatable({},{__mode='k'}) - function new() - local t = next(pool) - if t then - pool[t] = nil - return t - else - return {} - end - end - function del(t) - for k in pairs(t) do - t[k] = nil - end - pool[t] = true - end -end - -local DEFAULT_TREE_WIDTH = 175 -local DEFAULT_TREE_SIZABLE = true - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function GetButtonUniqueValue(line) - local parent = line.parent - if parent and parent.value then - return GetButtonUniqueValue(parent).."\001"..line.value - else - return line.value - end -end - -local function UpdateButton(button, treeline, selected, canExpand, isExpanded) - local self = button.obj - local toggle = button.toggle - local text = treeline.text or "" - local icon = treeline.icon - local iconCoords = treeline.iconCoords - local level = treeline.level - local value = treeline.value - local uniquevalue = treeline.uniquevalue - local disabled = treeline.disabled - - button.treeline = treeline - button.value = value - button.uniquevalue = uniquevalue - if selected then - button:LockHighlight() - button.selected = true - else - button:UnlockHighlight() - button.selected = false - end - button.level = level - if ( level == 1 ) then - button:SetNormalFontObject("GameFontNormal") - button:SetHighlightFontObject("GameFontHighlight") - button.text:SetPoint("LEFT", (icon and 16 or 0) + 8, 2) - else - button:SetNormalFontObject("GameFontHighlightSmall") - button:SetHighlightFontObject("GameFontHighlightSmall") - button.text:SetPoint("LEFT", (icon and 16 or 0) + 8 * level, 2) - end - - if disabled then - button:EnableMouse(false) - button.text:SetText("|cff808080"..text..FONT_COLOR_CODE_CLOSE) - else - button.text:SetText(text) - button:EnableMouse(true) - end - - if icon then - button.icon:SetTexture(icon) - button.icon:SetPoint("LEFT", 8 * level, (level == 1) and 0 or 1) - else - button.icon:SetTexture(nil) - end - - if iconCoords then - button.icon:SetTexCoord(unpack(iconCoords)) - else - button.icon:SetTexCoord(0, 1, 0, 1) - end - - if canExpand then - if not isExpanded then - toggle:SetNormalTexture(130838) -- Interface\\Buttons\\UI-PlusButton-UP - toggle:SetPushedTexture(130836) -- Interface\\Buttons\\UI-PlusButton-DOWN - else - toggle:SetNormalTexture(130821) -- Interface\\Buttons\\UI-MinusButton-UP - toggle:SetPushedTexture(130820) -- Interface\\Buttons\\UI-MinusButton-DOWN - end - toggle:Show() - else - toggle:Hide() - end -end - -local function ShouldDisplayLevel(tree) - local result = false - for k, v in ipairs(tree) do - if v.children == nil and v.visible ~= false then - result = true - elseif v.children then - result = result or ShouldDisplayLevel(v.children) - end - if result then return result end - end - return false -end - -local function addLine(self, v, tree, level, parent) - local line = new() - line.value = v.value - line.text = v.text - line.icon = v.icon - line.iconCoords = v.iconCoords - line.disabled = v.disabled - line.tree = tree - line.level = level - line.parent = parent - line.visible = v.visible - line.uniquevalue = GetButtonUniqueValue(line) - if v.children then - line.hasChildren = true - else - line.hasChildren = nil - end - self.lines[#self.lines+1] = line - return line -end - ---fire an update after one frame to catch the treeframes height -local function FirstFrameUpdate(frame) - local self = frame.obj - frame:SetScript("OnUpdate", nil) - self:RefreshTree(nil, true) -end - -local function BuildUniqueValue(...) - local n = select('#', ...) - if n == 1 then - return ... - else - return (...).."\001"..BuildUniqueValue(select(2,...)) - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Expand_OnClick(frame) - local button = frame.button - local self = button.obj - local status = (self.status or self.localstatus).groups - status[button.uniquevalue] = not status[button.uniquevalue] - self:RefreshTree() -end - -local function Button_OnClick(frame) - local self = frame.obj - self:Fire("OnClick", frame.uniquevalue, frame.selected) - if not frame.selected then - self:SetSelected(frame.uniquevalue) - frame.selected = true - frame:LockHighlight() - self:RefreshTree() - end - AceGUI:ClearFocus() -end - -local function Button_OnDoubleClick(button) - local self = button.obj - local status = (self.status or self.localstatus).groups - status[button.uniquevalue] = not status[button.uniquevalue] - self:RefreshTree() -end - -local function Button_OnEnter(frame) - local self = frame.obj - self:Fire("OnButtonEnter", frame.uniquevalue, frame) - - if self.enabletooltips then - GameTooltip:SetOwner(frame, "ANCHOR_NONE") - GameTooltip:SetPoint("LEFT",frame,"RIGHT") - GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, true) - - GameTooltip:Show() - end -end - -local function Button_OnLeave(frame) - local self = frame.obj - self:Fire("OnButtonLeave", frame.uniquevalue, frame) - - if self.enabletooltips then - GameTooltip:Hide() - end -end - -local function OnScrollValueChanged(frame, value) - if frame.obj.noupdate then return end - local self = frame.obj - local status = self.status or self.localstatus - status.scrollvalue = floor(value + 0.5) - self:RefreshTree() - AceGUI:ClearFocus() -end - -local function Tree_OnSizeChanged(frame) - frame.obj:RefreshTree() -end - -local function Tree_OnMouseWheel(frame, delta) - local self = frame.obj - if self.showscroll then - local scrollbar = self.scrollbar - local min, max = scrollbar:GetMinMaxValues() - local value = scrollbar:GetValue() - local newvalue = math_min(max,math_max(min,value - delta)) - if value ~= newvalue then - scrollbar:SetValue(newvalue) - end - end -end - -local function Dragger_OnLeave(frame) - frame:SetBackdropColor(1, 1, 1, 0) -end - -local function Dragger_OnEnter(frame) - frame:SetBackdropColor(1, 1, 1, 0.8) -end - -local function Dragger_OnMouseDown(frame) - local treeframe = frame:GetParent() - treeframe:StartSizing("RIGHT") -end - -local function Dragger_OnMouseUp(frame) - local treeframe = frame:GetParent() - local self = treeframe.obj - local frame = treeframe:GetParent() - treeframe:StopMovingOrSizing() - --treeframe:SetScript("OnUpdate", nil) - treeframe:SetUserPlaced(false) - --Without this :GetHeight will get stuck on the current height, causing the tree contents to not resize - treeframe:SetHeight(0) - treeframe:SetPoint("TOPLEFT", frame, "TOPLEFT",0,0) - treeframe:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT",0,0) - - local status = self.status or self.localstatus - status.treewidth = treeframe:GetWidth() - - treeframe.obj:Fire("OnTreeResize",treeframe:GetWidth()) - -- recalculate the content width - treeframe.obj:OnWidthSet(status.fullwidth) - -- update the layout of the content - treeframe.obj:DoLayout() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE) - self:EnableButtonTooltips(true) - self.frame:SetScript("OnUpdate", FirstFrameUpdate) - end, - - ["OnRelease"] = function(self) - self.status = nil - self.tree = nil - self.frame:SetScript("OnUpdate", nil) - for k, v in pairs(self.localstatus) do - if k == "groups" then - for k2 in pairs(v) do - v[k2] = nil - end - else - self.localstatus[k] = nil - end - end - self.localstatus.scrollvalue = 0 - self.localstatus.treewidth = DEFAULT_TREE_WIDTH - self.localstatus.treesizable = DEFAULT_TREE_SIZABLE - end, - - ["EnableButtonTooltips"] = function(self, enable) - self.enabletooltips = enable - end, - - ["CreateButton"] = function(self) - local num = AceGUI:GetNextWidgetNum("TreeGroupButton") - local button = CreateFrame("Button", ("AceGUI30TreeButton%d"):format(num), self.treeframe, "OptionsListButtonTemplate") - button.obj = self - - local icon = button:CreateTexture(nil, "OVERLAY") - icon:SetWidth(14) - icon:SetHeight(14) - button.icon = icon - - button:SetScript("OnClick",Button_OnClick) - button:SetScript("OnDoubleClick", Button_OnDoubleClick) - button:SetScript("OnEnter",Button_OnEnter) - button:SetScript("OnLeave",Button_OnLeave) - - button.toggle.button = button - button.toggle:SetScript("OnClick",Expand_OnClick) - - button.text:SetHeight(14) -- Prevents text wrapping - - return button - end, - - ["SetStatusTable"] = function(self, status) - assert(type(status) == "table") - self.status = status - if not status.groups then - status.groups = {} - end - if not status.scrollvalue then - status.scrollvalue = 0 - end - if not status.treewidth then - status.treewidth = DEFAULT_TREE_WIDTH - end - if status.treesizable == nil then - status.treesizable = DEFAULT_TREE_SIZABLE - end - self:SetTreeWidth(status.treewidth,status.treesizable) - self:RefreshTree() - end, - - --sets the tree to be displayed - ["SetTree"] = function(self, tree, filter) - self.filter = filter - if tree then - assert(type(tree) == "table") - end - self.tree = tree - self:RefreshTree() - end, - - ["BuildLevel"] = function(self, tree, level, parent) - local groups = (self.status or self.localstatus).groups - - for i, v in ipairs(tree) do - if v.children then - if not self.filter or ShouldDisplayLevel(v.children) then - local line = addLine(self, v, tree, level, parent) - if groups[line.uniquevalue] then - self:BuildLevel(v.children, level+1, line) - end - end - elseif v.visible ~= false or not self.filter then - addLine(self, v, tree, level, parent) - end - end - end, - - ["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate) - local buttons = self.buttons - local lines = self.lines - - for i, v in ipairs(buttons) do - v:Hide() - end - while lines[1] do - local t = tremove(lines) - for k in pairs(t) do - t[k] = nil - end - del(t) - end - - if not self.tree then return end - --Build the list of visible entries from the tree and status tables - local status = self.status or self.localstatus - local groupstatus = status.groups - local tree = self.tree - - local treeframe = self.treeframe - - status.scrollToSelection = status.scrollToSelection or scrollToSelection -- needs to be cached in case the control hasn't been drawn yet (code bails out below) - - self:BuildLevel(tree, 1) - - local numlines = #lines - - local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18)) - if maxlines <= 0 then return end - - -- workaround for lag spikes on WoW 8.0 - if WoW80 and self.frame:GetParent() == UIParent and not fromOnUpdate then - self.frame:SetScript("OnUpdate", FirstFrameUpdate) - return - end - - local first, last - - scrollToSelection = status.scrollToSelection - status.scrollToSelection = nil - - if numlines <= maxlines then - --the whole tree fits in the frame - status.scrollvalue = 0 - self:ShowScroll(false) - first, last = 1, numlines - else - self:ShowScroll(true) - --scrolling will be needed - self.noupdate = true - self.scrollbar:SetMinMaxValues(0, numlines - maxlines) - --check if we are scrolled down too far - if numlines - status.scrollvalue < maxlines then - status.scrollvalue = numlines - maxlines - end - self.noupdate = nil - first, last = status.scrollvalue+1, status.scrollvalue + maxlines - --show selection? - if scrollToSelection and status.selected then - local show - for i,line in ipairs(lines) do -- find the line number - if line.uniquevalue==status.selected then - show=i - end - end - if not show then - -- selection was deleted or something? - elseif show>=first and show<=last then - -- all good - else - -- scrolling needed! - if show<first then - status.scrollvalue = show-1 - else - status.scrollvalue = show-maxlines - end - first, last = status.scrollvalue+1, status.scrollvalue + maxlines - end - end - if self.scrollbar:GetValue() ~= status.scrollvalue then - self.scrollbar:SetValue(status.scrollvalue) - end - end - - local buttonnum = 1 - for i = first, last do - local line = lines[i] - local button = buttons[buttonnum] - if not button then - button = self:CreateButton() - - buttons[buttonnum] = button - button:SetParent(treeframe) - button:SetFrameLevel(treeframe:GetFrameLevel()+1) - button:ClearAllPoints() - if buttonnum == 1 then - if self.showscroll then - button:SetPoint("TOPRIGHT", -22, -10) - button:SetPoint("TOPLEFT", 0, -10) - else - button:SetPoint("TOPRIGHT", 0, -10) - button:SetPoint("TOPLEFT", 0, -10) - end - else - button:SetPoint("TOPRIGHT", buttons[buttonnum-1], "BOTTOMRIGHT",0,0) - button:SetPoint("TOPLEFT", buttons[buttonnum-1], "BOTTOMLEFT",0,0) - end - end - - UpdateButton(button, line, status.selected == line.uniquevalue, line.hasChildren, groupstatus[line.uniquevalue] ) - button:Show() - buttonnum = buttonnum + 1 - end - - end, - - ["SetSelected"] = function(self, value) - local status = self.status or self.localstatus - if status.selected ~= value then - status.selected = value - self:Fire("OnGroupSelected", value) - end - end, - - ["Select"] = function(self, uniquevalue, ...) - self.filter = false - local status = self.status or self.localstatus - local groups = status.groups - local path = {...} - for i = 1, #path do - groups[tconcat(path, "\001", 1, i)] = true - end - status.selected = uniquevalue - self:RefreshTree(true) - self:Fire("OnGroupSelected", uniquevalue) - end, - - ["SelectByPath"] = function(self, ...) - self:Select(BuildUniqueValue(...), ...) - end, - - ["SelectByValue"] = function(self, uniquevalue) - self:Select(uniquevalue, ("\001"):split(uniquevalue)) - end, - - ["ShowScroll"] = function(self, show) - self.showscroll = show - if show then - self.scrollbar:Show() - if self.buttons[1] then - self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",-22,-10) - end - else - self.scrollbar:Hide() - if self.buttons[1] then - self.buttons[1]:SetPoint("TOPRIGHT", self.treeframe,"TOPRIGHT",0,-10) - end - end - end, - - ["OnWidthSet"] = function(self, width) - local content = self.content - local treeframe = self.treeframe - local status = self.status or self.localstatus - status.fullwidth = width - - local contentwidth = width - status.treewidth - 20 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - - local maxtreewidth = math_min(400, width - 50) - - if maxtreewidth > 100 and status.treewidth > maxtreewidth then - self:SetTreeWidth(maxtreewidth, status.treesizable) - end - treeframe:SetMaxResize(maxtreewidth, 1600) - end, - - ["OnHeightSet"] = function(self, height) - local content = self.content - local contentheight = height - 20 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end, - - ["SetTreeWidth"] = function(self, treewidth, resizable) - if not resizable then - if type(treewidth) == 'number' then - resizable = false - elseif type(treewidth) == 'boolean' then - resizable = treewidth - treewidth = DEFAULT_TREE_WIDTH - else - resizable = false - treewidth = DEFAULT_TREE_WIDTH - end - end - self.treeframe:SetWidth(treewidth) - self.dragger:EnableMouse(resizable) - - local status = self.status or self.localstatus - status.treewidth = treewidth - status.treesizable = resizable - - -- recalculate the content width - if status.fullwidth then - self:OnWidthSet(status.fullwidth) - end - end, - - ["GetTreeWidth"] = function(self) - local status = self.status or self.localstatus - return status.treewidth or DEFAULT_TREE_WIDTH - end, - - ["LayoutFinished"] = function(self, width, height) - if self.noAutoHeight then return end - self:SetHeight((height or 0) + 20) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local PaneBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 5, bottom = 3 } -} - -local DraggerBackdrop = { - bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", - edgeFile = nil, - tile = true, tileSize = 16, edgeSize = 0, - insets = { left = 3, right = 3, top = 7, bottom = 7 } -} - -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame", nil, UIParent) - - local treeframe = CreateFrame("Frame", nil, frame) - treeframe:SetPoint("TOPLEFT") - treeframe:SetPoint("BOTTOMLEFT") - treeframe:SetWidth(DEFAULT_TREE_WIDTH) - treeframe:EnableMouseWheel(true) - treeframe:SetBackdrop(PaneBackdrop) - treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4) - treeframe:SetResizable(true) - treeframe:SetMinResize(100, 1) - treeframe:SetMaxResize(400, 1600) - treeframe:SetScript("OnUpdate", FirstFrameUpdate) - treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged) - treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel) - - local dragger = CreateFrame("Frame", nil, treeframe) - dragger:SetWidth(8) - dragger:SetPoint("TOP", treeframe, "TOPRIGHT") - dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT") - dragger:SetBackdrop(DraggerBackdrop) - dragger:SetBackdropColor(1, 1, 1, 0) - dragger:SetScript("OnEnter", Dragger_OnEnter) - dragger:SetScript("OnLeave", Dragger_OnLeave) - dragger:SetScript("OnMouseDown", Dragger_OnMouseDown) - dragger:SetScript("OnMouseUp", Dragger_OnMouseUp) - - local scrollbar = CreateFrame("Slider", ("AceConfigDialogTreeGroup%dScrollBar"):format(num), treeframe, "UIPanelScrollBarTemplate") - scrollbar:SetScript("OnValueChanged", nil) - scrollbar:SetPoint("TOPRIGHT", -10, -26) - scrollbar:SetPoint("BOTTOMRIGHT", -10, 26) - scrollbar:SetMinMaxValues(0,0) - scrollbar:SetValueStep(1) - scrollbar:SetValue(0) - scrollbar:SetWidth(16) - scrollbar:SetScript("OnValueChanged", OnScrollValueChanged) - - local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND") - scrollbg:SetAllPoints(scrollbar) - scrollbg:SetColorTexture(0,0,0,0.4) - - local border = CreateFrame("Frame",nil,frame) - border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT") - border:SetPoint("BOTTOMRIGHT") - border:SetBackdrop(PaneBackdrop) - border:SetBackdropColor(0.1, 0.1, 0.1, 0.5) - border:SetBackdropBorderColor(0.4, 0.4, 0.4) - - --Container Support - local content = CreateFrame("Frame", nil, border) - content:SetPoint("TOPLEFT", 10, -10) - content:SetPoint("BOTTOMRIGHT", -10, 10) - - local widget = { - frame = frame, - lines = {}, - levels = {}, - buttons = {}, - hasChildren = {}, - localstatus = { groups = {}, scrollvalue = 0 }, - filter = false, - treeframe = treeframe, - dragger = dragger, - scrollbar = scrollbar, - border = border, - content = content, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - treeframe.obj, dragger.obj, scrollbar.obj = widget, widget, widget - - return AceGUI:RegisterAsContainer(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua deleted file mode 100755 index a9192b3..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua +++ /dev/null @@ -1,336 +0,0 @@ -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local pairs, assert, type = pairs, assert, type - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontNormal - ----------------- --- Main Frame -- ----------------- ---[[ - Events : - OnClose - -]] -do - local Type = "Window" - local Version = 6 - - local function frameOnShow(this) - this.obj:Fire("OnShow") - end - - local function frameOnClose(this) - this.obj:Fire("OnClose") - end - - local function closeOnClick(this) - PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT - this.obj:Hide() - end - - local function frameOnMouseDown(this) - AceGUI:ClearFocus() - end - - local function titleOnMouseDown(this) - this:GetParent():StartMoving() - AceGUI:ClearFocus() - end - - local function frameOnMouseUp(this) - local frame = this:GetParent() - frame:StopMovingOrSizing() - local self = frame.obj - local status = self.status or self.localstatus - status.width = frame:GetWidth() - status.height = frame:GetHeight() - status.top = frame:GetTop() - status.left = frame:GetLeft() - end - - local function sizerseOnMouseDown(this) - this:GetParent():StartSizing("BOTTOMRIGHT") - AceGUI:ClearFocus() - end - - local function sizersOnMouseDown(this) - this:GetParent():StartSizing("BOTTOM") - AceGUI:ClearFocus() - end - - local function sizereOnMouseDown(this) - this:GetParent():StartSizing("RIGHT") - AceGUI:ClearFocus() - end - - local function sizerOnMouseUp(this) - this:GetParent():StopMovingOrSizing() - end - - local function SetTitle(self,title) - self.titletext:SetText(title) - end - - local function SetStatusText(self,text) - -- self.statustext:SetText(text) - end - - local function Hide(self) - self.frame:Hide() - end - - local function Show(self) - self.frame:Show() - end - - local function OnAcquire(self) - self.frame:SetParent(UIParent) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") - self:ApplyStatus() - self:EnableResize(true) - self:Show() - end - - local function OnRelease(self) - self.status = nil - for k in pairs(self.localstatus) do - self.localstatus[k] = nil - end - end - - -- called to set an external table to store status in - local function SetStatusTable(self, status) - assert(type(status) == "table") - self.status = status - self:ApplyStatus() - end - - local function ApplyStatus(self) - local status = self.status or self.localstatus - local frame = self.frame - self:SetWidth(status.width or 700) - self:SetHeight(status.height or 500) - if status.top and status.left then - frame:SetPoint("TOP",UIParent,"BOTTOM",0,status.top) - frame:SetPoint("LEFT",UIParent,"LEFT",status.left,0) - else - frame:SetPoint("CENTER",UIParent,"CENTER") - end - end - - local function OnWidthSet(self, width) - local content = self.content - local contentwidth = width - 34 - if contentwidth < 0 then - contentwidth = 0 - end - content:SetWidth(contentwidth) - content.width = contentwidth - end - - - local function OnHeightSet(self, height) - local content = self.content - local contentheight = height - 57 - if contentheight < 0 then - contentheight = 0 - end - content:SetHeight(contentheight) - content.height = contentheight - end - - local function EnableResize(self, state) - local func = state and "Show" or "Hide" - self.sizer_se[func](self.sizer_se) - self.sizer_s[func](self.sizer_s) - self.sizer_e[func](self.sizer_e) - end - - local function Constructor() - local frame = CreateFrame("Frame",nil,UIParent) - local self = {} - self.type = "Window" - - self.Hide = Hide - self.Show = Show - self.SetTitle = SetTitle - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - self.SetStatusText = SetStatusText - self.SetStatusTable = SetStatusTable - self.ApplyStatus = ApplyStatus - self.OnWidthSet = OnWidthSet - self.OnHeightSet = OnHeightSet - self.EnableResize = EnableResize - - self.localstatus = {} - - self.frame = frame - frame.obj = self - frame:SetWidth(700) - frame:SetHeight(500) - frame:SetPoint("CENTER",UIParent,"CENTER",0,0) - frame:EnableMouse() - frame:SetMovable(true) - frame:SetResizable(true) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetScript("OnMouseDown", frameOnMouseDown) - - frame:SetScript("OnShow",frameOnShow) - frame:SetScript("OnHide",frameOnClose) - frame:SetMinResize(240,240) - frame:SetToplevel(true) - - local titlebg = frame:CreateTexture(nil, "BACKGROUND") - titlebg:SetTexture(251966) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Title-Background - titlebg:SetPoint("TOPLEFT", 9, -6) - titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24) - - local dialogbg = frame:CreateTexture(nil, "BACKGROUND") - dialogbg:SetTexture(137056) -- Interface\\Tooltips\\UI-Tooltip-Background - dialogbg:SetPoint("TOPLEFT", 8, -24) - dialogbg:SetPoint("BOTTOMRIGHT", -6, 8) - dialogbg:SetVertexColor(0, 0, 0, .75) - - local topleft = frame:CreateTexture(nil, "BORDER") - topleft:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - topleft:SetWidth(64) - topleft:SetHeight(64) - topleft:SetPoint("TOPLEFT") - topleft:SetTexCoord(0.501953125, 0.625, 0, 1) - - local topright = frame:CreateTexture(nil, "BORDER") - topright:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - topright:SetWidth(64) - topright:SetHeight(64) - topright:SetPoint("TOPRIGHT") - topright:SetTexCoord(0.625, 0.75, 0, 1) - - local top = frame:CreateTexture(nil, "BORDER") - top:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - top:SetHeight(64) - top:SetPoint("TOPLEFT", topleft, "TOPRIGHT") - top:SetPoint("TOPRIGHT", topright, "TOPLEFT") - top:SetTexCoord(0.25, 0.369140625, 0, 1) - - local bottomleft = frame:CreateTexture(nil, "BORDER") - bottomleft:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - bottomleft:SetWidth(64) - bottomleft:SetHeight(64) - bottomleft:SetPoint("BOTTOMLEFT") - bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1) - - local bottomright = frame:CreateTexture(nil, "BORDER") - bottomright:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - bottomright:SetWidth(64) - bottomright:SetHeight(64) - bottomright:SetPoint("BOTTOMRIGHT") - bottomright:SetTexCoord(0.875, 1, 0, 1) - - local bottom = frame:CreateTexture(nil, "BORDER") - bottom:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - bottom:SetHeight(64) - bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT") - bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT") - bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1) - - local left = frame:CreateTexture(nil, "BORDER") - left:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - left:SetWidth(64) - left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT") - left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT") - left:SetTexCoord(0.001953125, 0.125, 0, 1) - - local right = frame:CreateTexture(nil, "BORDER") - right:SetTexture(251963) -- Interface\\PaperDollInfoFrame\\UI-GearManager-Border - right:SetWidth(64) - right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT") - right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT") - right:SetTexCoord(0.1171875, 0.2421875, 0, 1) - - local close = CreateFrame("Button", nil, frame, "UIPanelCloseButton") - close:SetPoint("TOPRIGHT", 2, 1) - close:SetScript("OnClick", closeOnClick) - self.closebutton = close - close.obj = self - - local titletext = frame:CreateFontString(nil, "ARTWORK") - titletext:SetFontObject(GameFontNormal) - titletext:SetPoint("TOPLEFT", 12, -8) - titletext:SetPoint("TOPRIGHT", -32, -8) - self.titletext = titletext - - local title = CreateFrame("Button", nil, frame) - title:SetPoint("TOPLEFT", titlebg) - title:SetPoint("BOTTOMRIGHT", titlebg) - title:EnableMouse() - title:SetScript("OnMouseDown",titleOnMouseDown) - title:SetScript("OnMouseUp", frameOnMouseUp) - self.title = title - - local sizer_se = CreateFrame("Frame",nil,frame) - sizer_se:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,0) - sizer_se:SetWidth(25) - sizer_se:SetHeight(25) - sizer_se:EnableMouse() - sizer_se:SetScript("OnMouseDown",sizerseOnMouseDown) - sizer_se:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_se = sizer_se - - local line1 = sizer_se:CreateTexture(nil, "BACKGROUND") - self.line1 = line1 - line1:SetWidth(14) - line1:SetHeight(14) - line1:SetPoint("BOTTOMRIGHT", -8, 8) - line1:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 14/17 - line1:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local line2 = sizer_se:CreateTexture(nil, "BACKGROUND") - self.line2 = line2 - line2:SetWidth(8) - line2:SetHeight(8) - line2:SetPoint("BOTTOMRIGHT", -8, 8) - line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - local x = 0.1 * 8/17 - line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5) - - local sizer_s = CreateFrame("Frame",nil,frame) - sizer_s:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-25,0) - sizer_s:SetPoint("BOTTOMLEFT",frame,"BOTTOMLEFT",0,0) - sizer_s:SetHeight(25) - sizer_s:EnableMouse() - sizer_s:SetScript("OnMouseDown",sizersOnMouseDown) - sizer_s:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_s = sizer_s - - local sizer_e = CreateFrame("Frame",nil,frame) - sizer_e:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",0,25) - sizer_e:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - sizer_e:SetWidth(25) - sizer_e:EnableMouse() - sizer_e:SetScript("OnMouseDown",sizereOnMouseDown) - sizer_e:SetScript("OnMouseUp", sizerOnMouseUp) - self.sizer_e = sizer_e - - --Container Support - local content = CreateFrame("Frame",nil,frame) - self.content = content - content.obj = self - content:SetPoint("TOPLEFT",frame,"TOPLEFT",12,-32) - content:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-12,13) - - AceGUI:RegisterAsContainer(self) - return self - end - - AceGUI:RegisterWidgetType(Type,Constructor,Version) -end diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua deleted file mode 100755 index 8e650ce..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua +++ /dev/null @@ -1,103 +0,0 @@ ---[[----------------------------------------------------------------------------- -Button Widget -Graphical Button. --------------------------------------------------------------------------------]] -local Type, Version = "Button", 24 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local _G = _G -local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Button_OnClick(frame, ...) - AceGUI:ClearFocus() - PlaySound(852) -- SOUNDKIT.IG_MAINMENU_OPTION - frame.obj:Fire("OnClick", ...) -end - -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- restore default values - self:SetHeight(24) - self:SetWidth(200) - self:SetDisabled(false) - self:SetAutoWidth(false) - self:SetText() - end, - - -- ["OnRelease"] = nil, - - ["SetText"] = function(self, text) - self.text:SetText(text) - if self.autoWidth then - self:SetWidth(self.text:GetStringWidth() + 30) - end - end, - - ["SetAutoWidth"] = function(self, autoWidth) - self.autoWidth = autoWidth - if self.autoWidth then - self:SetWidth(self.text:GetStringWidth() + 30) - end - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - else - self.frame:Enable() - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate") - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnClick", Button_OnClick) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - - local text = frame:GetFontString() - text:ClearAllPoints() - text:SetPoint("TOPLEFT", 15, -1) - text:SetPoint("BOTTOMRIGHT", -15, 1) - text:SetJustifyV("MIDDLE") - - local widget = { - text = text, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua deleted file mode 100755 index d2adb88..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua +++ /dev/null @@ -1,296 +0,0 @@ ---[[----------------------------------------------------------------------------- -Checkbox Widget --------------------------------------------------------------------------------]] -local Type, Version = "CheckBox", 26 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs = select, pairs - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: SetDesaturation, GameFontHighlight - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function AlignImage(self) - local img = self.image:GetTexture() - self.text:ClearAllPoints() - if not img then - self.text:SetPoint("LEFT", self.checkbg, "RIGHT") - self.text:SetPoint("RIGHT") - else - self.text:SetPoint("LEFT", self.image, "RIGHT", 1, 0) - self.text:SetPoint("RIGHT") - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function CheckBox_OnMouseDown(frame) - local self = frame.obj - if not self.disabled then - if self.image:GetTexture() then - self.text:SetPoint("LEFT", self.image,"RIGHT", 2, -1) - else - self.text:SetPoint("LEFT", self.checkbg, "RIGHT", 1, -1) - end - end - AceGUI:ClearFocus() -end - -local function CheckBox_OnMouseUp(frame) - local self = frame.obj - if not self.disabled then - self:ToggleChecked() - - if self.checked then - PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON - else -- for both nil and false (tristate) - PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF - end - - self:Fire("OnValueChanged", self.checked) - AlignImage(self) - end -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetType() - self:SetValue(false) - self:SetTriState(nil) - -- height is calculated from the width and required space for the description - self:SetWidth(200) - self:SetImage() - self:SetDisabled(nil) - self:SetDescription(nil) - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - if self.desc then - self.desc:SetWidth(width - 30) - if self.desc:GetText() and self.desc:GetText() ~= "" then - self:SetHeight(28 + self.desc:GetStringHeight()) - end - end - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - self.text:SetTextColor(0.5, 0.5, 0.5) - SetDesaturation(self.check, true) - if self.desc then - self.desc:SetTextColor(0.5, 0.5, 0.5) - end - else - self.frame:Enable() - self.text:SetTextColor(1, 1, 1) - if self.tristate and self.checked == nil then - SetDesaturation(self.check, true) - else - SetDesaturation(self.check, false) - end - if self.desc then - self.desc:SetTextColor(1, 1, 1) - end - end - end, - - ["SetValue"] = function(self, value) - local check = self.check - self.checked = value - if value then - SetDesaturation(check, false) - check:Show() - else - --Nil is the unknown tristate value - if self.tristate and value == nil then - SetDesaturation(check, true) - check:Show() - else - SetDesaturation(check, false) - check:Hide() - end - end - self:SetDisabled(self.disabled) - end, - - ["GetValue"] = function(self) - return self.checked - end, - - ["SetTriState"] = function(self, enabled) - self.tristate = enabled - self:SetValue(self:GetValue()) - end, - - ["SetType"] = function(self, type) - local checkbg = self.checkbg - local check = self.check - local highlight = self.highlight - - local size - if type == "radio" then - size = 16 - checkbg:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton - checkbg:SetTexCoord(0, 0.25, 0, 1) - check:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton - check:SetTexCoord(0.25, 0.5, 0, 1) - check:SetBlendMode("ADD") - highlight:SetTexture(130843) -- Interface\\Buttons\\UI-RadioButton - highlight:SetTexCoord(0.5, 0.75, 0, 1) - else - size = 24 - checkbg:SetTexture(130755) -- Interface\\Buttons\\UI-CheckBox-Up - checkbg:SetTexCoord(0, 1, 0, 1) - check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check - check:SetTexCoord(0, 1, 0, 1) - check:SetBlendMode("BLEND") - highlight:SetTexture(130753) -- Interface\\Buttons\\UI-CheckBox-Highlight - highlight:SetTexCoord(0, 1, 0, 1) - end - checkbg:SetHeight(size) - checkbg:SetWidth(size) - end, - - ["ToggleChecked"] = function(self) - local value = self:GetValue() - if self.tristate then - --cycle in true, nil, false order - if value then - self:SetValue(nil) - elseif value == nil then - self:SetValue(false) - else - self:SetValue(true) - end - else - self:SetValue(not self:GetValue()) - end - end, - - ["SetLabel"] = function(self, label) - self.text:SetText(label) - end, - - ["SetDescription"] = function(self, desc) - if desc then - if not self.desc then - local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall") - desc:ClearAllPoints() - desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21) - desc:SetWidth(self.frame.width - 30) - desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0) - desc:SetJustifyH("LEFT") - desc:SetJustifyV("TOP") - self.desc = desc - end - self.desc:Show() - --self.text:SetFontObject(GameFontNormal) - self.desc:SetText(desc) - self:SetHeight(28 + self.desc:GetStringHeight()) - else - if self.desc then - self.desc:SetText("") - self.desc:Hide() - end - --self.text:SetFontObject(GameFontHighlight) - self:SetHeight(24) - end - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - end - AlignImage(self) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnMouseDown", CheckBox_OnMouseDown) - frame:SetScript("OnMouseUp", CheckBox_OnMouseUp) - - local checkbg = frame:CreateTexture(nil, "ARTWORK") - checkbg:SetWidth(24) - checkbg:SetHeight(24) - checkbg:SetPoint("TOPLEFT") - checkbg:SetTexture(130755) -- Interface\\Buttons\\UI-CheckBox-Up - - local check = frame:CreateTexture(nil, "OVERLAY") - check:SetAllPoints(checkbg) - check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check - - local text = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") - text:SetJustifyH("LEFT") - text:SetHeight(18) - text:SetPoint("LEFT", checkbg, "RIGHT") - text:SetPoint("RIGHT") - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetTexture(130753) -- Interface\\Buttons\\UI-CheckBox-Highlight - highlight:SetBlendMode("ADD") - highlight:SetAllPoints(checkbg) - - local image = frame:CreateTexture(nil, "OVERLAY") - image:SetHeight(16) - image:SetWidth(16) - image:SetPoint("LEFT", checkbg, "RIGHT", 1, 0) - - local widget = { - checkbg = checkbg, - check = check, - text = text, - highlight = highlight, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua deleted file mode 100755 index f4cab66..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua +++ /dev/null @@ -1,190 +0,0 @@ ---[[----------------------------------------------------------------------------- -ColorPicker Widget --------------------------------------------------------------------------------]] -local Type, Version = "ColorPicker", 25 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ColorPickerFrame, OpacitySliderFrame - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function ColorCallback(self, r, g, b, a, isAlpha) - if not self.HasAlpha then - a = 1 - end - self:SetColor(r, g, b, a) - if ColorPickerFrame:IsVisible() then - --colorpicker is still open - self:Fire("OnValueChanged", r, g, b, a) - else - --colorpicker is closed, color callback is first, ignore it, - --alpha callback is the final call after it closes so confirm now - if isAlpha then - self:Fire("OnValueConfirmed", r, g, b, a) - end - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function ColorSwatch_OnClick(frame) - ColorPickerFrame:Hide() - local self = frame.obj - if not self.disabled then - ColorPickerFrame:SetFrameStrata("FULLSCREEN_DIALOG") - ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10) - ColorPickerFrame:SetClampedToScreen(true) - - ColorPickerFrame.func = function() - local r, g, b = ColorPickerFrame:GetColorRGB() - local a = 1 - OpacitySliderFrame:GetValue() - ColorCallback(self, r, g, b, a) - end - - ColorPickerFrame.hasOpacity = self.HasAlpha - ColorPickerFrame.opacityFunc = function() - local r, g, b = ColorPickerFrame:GetColorRGB() - local a = 1 - OpacitySliderFrame:GetValue() - ColorCallback(self, r, g, b, a, true) - end - - local r, g, b, a = self.r, self.g, self.b, self.a - if self.HasAlpha then - ColorPickerFrame.opacity = 1 - (a or 0) - end - ColorPickerFrame:SetColorRGB(r, g, b) - - ColorPickerFrame.cancelFunc = function() - ColorCallback(self, r, g, b, a, true) - end - - ColorPickerFrame:Show() - end - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetHeight(24) - self:SetWidth(200) - self:SetHasAlpha(false) - self:SetColor(0, 0, 0, 1) - self:SetDisabled(nil) - self:SetLabel(nil) - end, - - -- ["OnRelease"] = nil, - - ["SetLabel"] = function(self, text) - self.text:SetText(text) - end, - - ["SetColor"] = function(self, r, g, b, a) - self.r = r - self.g = g - self.b = b - self.a = a or 1 - self.colorSwatch:SetVertexColor(r, g, b, a) - end, - - ["SetHasAlpha"] = function(self, HasAlpha) - self.HasAlpha = HasAlpha - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if self.disabled then - self.frame:Disable() - self.text:SetTextColor(0.5, 0.5, 0.5) - else - self.frame:Enable() - self.text:SetTextColor(1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnClick", ColorSwatch_OnClick) - - local colorSwatch = frame:CreateTexture(nil, "OVERLAY") - colorSwatch:SetWidth(19) - colorSwatch:SetHeight(19) - colorSwatch:SetTexture(130939) -- Interface\\ChatFrame\\ChatFrameColorSwatch - colorSwatch:SetPoint("LEFT") - - local texture = frame:CreateTexture(nil, "BACKGROUND") - colorSwatch.background = texture - texture:SetWidth(16) - texture:SetHeight(16) - texture:SetColorTexture(1, 1, 1) - texture:SetPoint("CENTER", colorSwatch) - texture:Show() - - local checkers = frame:CreateTexture(nil, "BACKGROUND") - colorSwatch.checkers = checkers - checkers:SetWidth(14) - checkers:SetHeight(14) - checkers:SetTexture(188523) -- Tileset\\Generic\\Checkers - checkers:SetTexCoord(.25, 0, 0.5, .25) - checkers:SetDesaturated(true) - checkers:SetVertexColor(1, 1, 1, 0.75) - checkers:SetPoint("CENTER", colorSwatch) - checkers:Show() - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontHighlight") - text:SetHeight(24) - text:SetJustifyH("LEFT") - text:SetTextColor(1, 1, 1) - text:SetPoint("LEFT", colorSwatch, "RIGHT", 2, 0) - text:SetPoint("RIGHT") - - --local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - --highlight:SetTexture(136810) -- Interface\\QuestFrame\\UI-QuestTitleHighlight - --highlight:SetBlendMode("ADD") - --highlight:SetAllPoints(frame) - - local widget = { - colorSwatch = colorSwatch, - text = text, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua deleted file mode 100755 index 9dd4b60..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua +++ /dev/null @@ -1,471 +0,0 @@ ---[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]-- - -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local select, assert = select, assert - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame = CreateFrame - -local function fixlevels(parent,...) - local i = 1 - local child = select(i, ...) - while child do - child:SetFrameLevel(parent:GetFrameLevel()+1) - fixlevels(child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -local function fixstrata(strata, parent, ...) - local i = 1 - local child = select(i, ...) - parent:SetFrameStrata(strata) - while child do - fixstrata(strata, child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - --- ItemBase is the base "class" for all dropdown items. --- Each item has to use ItemBase.Create(widgetType) to --- create an initial 'self' value. --- ItemBase will add common functions and ui event handlers. --- Be sure to keep basic usage when you override functions. - -local ItemBase = { - -- NOTE: The ItemBase version is added to each item's version number - -- to ensure proper updates on ItemBase changes. - -- Use at least 1000er steps. - version = 1000, - counter = 0, -} - -function ItemBase.Frame_OnEnter(this) - local self = this.obj - - if self.useHighlight then - self.highlight:Show() - end - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end -end - -function ItemBase.Frame_OnLeave(this) - local self = this.obj - - self.highlight:Hide() - self:Fire("OnLeave") - - if self.specialOnLeave then - self.specialOnLeave(self) - end -end - --- exported, AceGUI callback -function ItemBase.OnAcquire(self) - self.frame:SetToplevel(true) - self.frame:SetFrameStrata("FULLSCREEN_DIALOG") -end - --- exported, AceGUI callback -function ItemBase.OnRelease(self) - self:SetDisabled(false) - self.pullout = nil - self.frame:SetParent(nil) - self.frame:ClearAllPoints() - self.frame:Hide() -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetPullout(self, pullout) - self.pullout = pullout - - self.frame:SetParent(nil) - self.frame:SetParent(pullout.itemFrame) - self.parent = pullout.itemFrame - fixlevels(pullout.itemFrame, pullout.itemFrame:GetChildren()) -end - --- exported -function ItemBase.SetText(self, text) - self.text:SetText(text or "") -end - --- exported -function ItemBase.GetText(self) - return self.text:GetText() -end - --- exported -function ItemBase.SetPoint(self, ...) - self.frame:SetPoint(...) -end - --- exported -function ItemBase.Show(self) - self.frame:Show() -end - --- exported -function ItemBase.Hide(self) - self.frame:Hide() -end - --- exported -function ItemBase.SetDisabled(self, disabled) - self.disabled = disabled - if disabled then - self.useHighlight = false - self.text:SetTextColor(.5, .5, .5) - else - self.useHighlight = true - self.text:SetTextColor(1, 1, 1) - end -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetOnLeave(self, func) - self.specialOnLeave = func -end - --- exported --- NOTE: this is called by a Dropdown-Pullout. --- Do not call this method directly -function ItemBase.SetOnEnter(self, func) - self.specialOnEnter = func -end - -function ItemBase.Create(type) - -- NOTE: Most of the following code is copied from AceGUI-3.0/Dropdown widget - local count = AceGUI:GetNextWidgetNum(type) - local frame = CreateFrame("Button", "AceGUI30DropDownItem"..count) - local self = {} - self.frame = frame - frame.obj = self - self.type = type - - self.useHighlight = true - - frame:SetHeight(17) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - - local text = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - text:SetTextColor(1,1,1) - text:SetJustifyH("LEFT") - text:SetPoint("TOPLEFT",frame,"TOPLEFT",18,0) - text:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",-8,0) - self.text = text - - local highlight = frame:CreateTexture(nil, "OVERLAY") - highlight:SetTexture(136810) -- Interface\\QuestFrame\\UI-QuestTitleHighlight - highlight:SetBlendMode("ADD") - highlight:SetHeight(14) - highlight:ClearAllPoints() - highlight:SetPoint("RIGHT",frame,"RIGHT",-3,0) - highlight:SetPoint("LEFT",frame,"LEFT",5,0) - highlight:Hide() - self.highlight = highlight - - local check = frame:CreateTexture("OVERLAY") - check:SetWidth(16) - check:SetHeight(16) - check:SetPoint("LEFT",frame,"LEFT",3,-1) - check:SetTexture(130751) -- Interface\\Buttons\\UI-CheckBox-Check - check:Hide() - self.check = check - - local sub = frame:CreateTexture("OVERLAY") - sub:SetWidth(16) - sub:SetHeight(16) - sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1) - sub:SetTexture(130940) -- Interface\\ChatFrame\\ChatFrameExpandArrow - sub:Hide() - self.sub = sub - - frame:SetScript("OnEnter", ItemBase.Frame_OnEnter) - frame:SetScript("OnLeave", ItemBase.Frame_OnLeave) - - self.OnAcquire = ItemBase.OnAcquire - self.OnRelease = ItemBase.OnRelease - - self.SetPullout = ItemBase.SetPullout - self.GetText = ItemBase.GetText - self.SetText = ItemBase.SetText - self.SetDisabled = ItemBase.SetDisabled - - self.SetPoint = ItemBase.SetPoint - self.Show = ItemBase.Show - self.Hide = ItemBase.Hide - - self.SetOnLeave = ItemBase.SetOnLeave - self.SetOnEnter = ItemBase.SetOnEnter - - return self -end - --- Register a dummy LibStub library to retrieve the ItemBase, so other addons can use it. -local IBLib = LibStub:NewLibrary("AceGUI-3.0-DropDown-ItemBase", ItemBase.version) -if IBLib then - IBLib.GetItemBase = function() return ItemBase end -end - ---[[ - Template for items: - --- Item: --- -do - local widgetType = "Dropdown-Item-" - local widgetVersion = 1 - - local function Constructor() - local self = ItemBase.Create(widgetType) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end ---]] - --- Item: Header --- A single text entry. --- Special: Different text color and no highlight -do - local widgetType = "Dropdown-Item-Header" - local widgetVersion = 1 - - local function OnEnter(this) - local self = this.obj - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end - end - - local function OnLeave(this) - local self = this.obj - self:Fire("OnLeave") - - if self.specialOnLeave then - self.specialOnLeave(self) - end - end - - -- exported, override - local function SetDisabled(self, disabled) - ItemBase.SetDisabled(self, disabled) - if not disabled then - self.text:SetTextColor(1, 1, 0) - end - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.SetDisabled = SetDisabled - - self.frame:SetScript("OnEnter", OnEnter) - self.frame:SetScript("OnLeave", OnLeave) - - self.text:SetTextColor(1, 1, 0) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Execute --- A simple button -do - local widgetType = "Dropdown-Item-Execute" - local widgetVersion = 1 - - local function Frame_OnClick(this, button) - local self = this.obj - if self.disabled then return end - self:Fire("OnClick") - if self.pullout then - self.pullout:Close() - end - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.frame:SetScript("OnClick", Frame_OnClick) - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Toggle --- Some sort of checkbox for dropdown menus. --- Does not close the pullout on click. -do - local widgetType = "Dropdown-Item-Toggle" - local widgetVersion = 4 - - local function UpdateToggle(self) - if self.value then - self.check:Show() - else - self.check:Hide() - end - end - - local function OnRelease(self) - ItemBase.OnRelease(self) - self:SetValue(nil) - end - - local function Frame_OnClick(this, button) - local self = this.obj - if self.disabled then return end - self.value = not self.value - if self.value then - PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON - else - PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF - end - UpdateToggle(self) - self:Fire("OnValueChanged", self.value) - end - - -- exported - local function SetValue(self, value) - self.value = value - UpdateToggle(self) - end - - -- exported - local function GetValue(self) - return self.value - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.frame:SetScript("OnClick", Frame_OnClick) - - self.SetValue = SetValue - self.GetValue = GetValue - self.OnRelease = OnRelease - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Menu --- Shows a submenu on mouse over --- Does not close the pullout on click -do - local widgetType = "Dropdown-Item-Menu" - local widgetVersion = 2 - - local function OnEnter(this) - local self = this.obj - self:Fire("OnEnter") - - if self.specialOnEnter then - self.specialOnEnter(self) - end - - self.highlight:Show() - - if not self.disabled and self.submenu then - self.submenu:Open("TOPLEFT", self.frame, "TOPRIGHT", self.pullout:GetRightBorderWidth(), 0, self.frame:GetFrameLevel() + 100) - end - end - - local function OnHide(this) - local self = this.obj - if self.submenu then - self.submenu:Close() - end - end - - -- exported - local function SetMenu(self, menu) - assert(menu.type == "Dropdown-Pullout") - self.submenu = menu - end - - -- exported - local function CloseMenu(self) - self.submenu:Close() - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.sub:Show() - - self.frame:SetScript("OnEnter", OnEnter) - self.frame:SetScript("OnHide", OnHide) - - self.SetMenu = SetMenu - self.CloseMenu = CloseMenu - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end - --- Item: Separator --- A single line to separate items -do - local widgetType = "Dropdown-Item-Separator" - local widgetVersion = 2 - - -- exported, override - local function SetDisabled(self, disabled) - ItemBase.SetDisabled(self, disabled) - self.useHighlight = false - end - - local function Constructor() - local self = ItemBase.Create(widgetType) - - self.SetDisabled = SetDisabled - - local line = self.frame:CreateTexture(nil, "OVERLAY") - line:SetHeight(1) - line:SetColorTexture(.5, .5, .5) - line:SetPoint("LEFT", self.frame, "LEFT", 10, 0) - line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0) - - self.text:Hide() - - self.useHighlight = false - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion + ItemBase.version) -end diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua deleted file mode 100755 index 2242b78..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua +++ /dev/null @@ -1,737 +0,0 @@ ---[[ $Id: AceGUIWidget-DropDown.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]-- -local AceGUI = LibStub("AceGUI-3.0") - --- Lua APIs -local min, max, floor = math.min, math.max, math.floor -local select, pairs, ipairs, type = select, pairs, ipairs, type -local tsort = table.sort - --- WoW APIs -local PlaySound = PlaySound -local UIParent, CreateFrame = UIParent, CreateFrame -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: CLOSE - -local function fixlevels(parent,...) - local i = 1 - local child = select(i, ...) - while child do - child:SetFrameLevel(parent:GetFrameLevel()+1) - fixlevels(child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -local function fixstrata(strata, parent, ...) - local i = 1 - local child = select(i, ...) - parent:SetFrameStrata(strata) - while child do - fixstrata(strata, child, child:GetChildren()) - i = i + 1 - child = select(i, ...) - end -end - -do - local widgetType = "Dropdown-Pullout" - local widgetVersion = 3 - - --[[ Static data ]]-- - - local backdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\DialogFrame\\UI-DialogBox-Border", - edgeSize = 32, - tileSize = 32, - tile = true, - insets = { left = 11, right = 12, top = 12, bottom = 11 }, - } - local sliderBackdrop = { - bgFile = "Interface\\Buttons\\UI-SliderBar-Background", - edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", - tile = true, tileSize = 8, edgeSize = 8, - insets = { left = 3, right = 3, top = 3, bottom = 3 } - } - - local defaultWidth = 200 - local defaultMaxHeight = 600 - - --[[ UI Event Handlers ]]-- - - -- HACK: This should be no part of the pullout, but there - -- is no other 'clean' way to response to any item-OnEnter - -- Used to close Submenus when an other item is entered - local function OnEnter(item) - local self = item.pullout - for k, v in ipairs(self.items) do - if v.CloseMenu and v ~= item then - v:CloseMenu() - end - end - end - - -- See the note in Constructor() for each scroll related function - local function OnMouseWheel(this, value) - this.obj:MoveScroll(value) - end - - local function OnScrollValueChanged(this, value) - this.obj:SetScroll(value) - end - - local function OnSizeChanged(this) - this.obj:FixScroll() - end - - --[[ Exported methods ]]-- - - -- exported - local function SetScroll(self, value) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - - local offset - if height > viewheight then - offset = 0 - else - offset = floor((viewheight - height) / 1000 * value) - 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 - - -- exported - local function MoveScroll(self, value) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - - if height > viewheight then - self.slider:Hide() - else - self.slider:Show() - local diff = height - viewheight - local delta = 1 - if value < 0 then - delta = -1 - end - self.slider:SetValue(min(max(status.scrollvalue + delta*(1000/(diff/45)),0), 1000)) - end - end - - -- exported - local function FixScroll(self) - local status = self.scrollStatus - local frame, child = self.scrollFrame, self.itemFrame - local height, viewheight = frame:GetHeight(), child:GetHeight() - local offset = status.offset or 0 - - if viewheight < height then - self.slider:Hide() - child:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, offset) - self.slider:SetValue(0) - else - self.slider:Show() - local value = (offset / (viewheight - height) * 1000) - if value > 1000 then value = 1000 end - self.slider:SetValue(value) - self:SetScroll(value) - 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 - end - - -- exported, AceGUI callback - local function OnAcquire(self) - self.frame:SetParent(UIParent) - --self.itemFrame:SetToplevel(true) - end - - -- exported, AceGUI callback - local function OnRelease(self) - self:Clear() - self.frame:ClearAllPoints() - self.frame:Hide() - end - - -- exported - local function AddItem(self, item) - self.items[#self.items + 1] = item - - local h = #self.items * 16 - self.itemFrame:SetHeight(h) - self.frame:SetHeight(min(h + 34, self.maxHeight)) -- +34: 20 for scrollFrame placement (10 offset) and +14 for item placement - - item.frame:SetPoint("LEFT", self.itemFrame, "LEFT") - item.frame:SetPoint("RIGHT", self.itemFrame, "RIGHT") - - item:SetPullout(self) - item:SetOnEnter(OnEnter) - end - - -- exported - local function Open(self, point, relFrame, relPoint, x, y) - local items = self.items - local frame = self.frame - local itemFrame = self.itemFrame - - frame:SetPoint(point, relFrame, relPoint, x, y) - - - local height = 8 - for i, item in pairs(items) do - if i == 1 then - item:SetPoint("TOP", itemFrame, "TOP", 0, -2) - else - item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1) - end - - item:Show() - - height = height + 16 - end - itemFrame:SetHeight(height) - fixstrata("TOOLTIP", frame, frame:GetChildren()) - frame:Show() - self:Fire("OnOpen") - end - - -- exported - local function Close(self) - self.frame:Hide() - self:Fire("OnClose") - end - - -- exported - local function Clear(self) - local items = self.items - for i, item in pairs(items) do - AceGUI:Release(item) - items[i] = nil - end - end - - -- exported - local function IterateItems(self) - return ipairs(self.items) - end - - -- exported - local function SetHideOnLeave(self, val) - self.hideOnLeave = val - end - - -- exported - local function SetMaxHeight(self, height) - self.maxHeight = height or defaultMaxHeight - if self.frame:GetHeight() > height then - self.frame:SetHeight(height) - elseif (self.itemFrame:GetHeight() + 34) < height then - self.frame:SetHeight(self.itemFrame:GetHeight() + 34) -- see :AddItem - end - end - - -- exported - local function GetRightBorderWidth(self) - return 6 + (self.slider:IsShown() and 12 or 0) - end - - -- exported - local function GetLeftBorderWidth(self) - return 6 - end - - --[[ Constructor ]]-- - - local function Constructor() - local count = AceGUI:GetNextWidgetNum(widgetType) - local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent) - local self = {} - self.count = count - self.type = widgetType - self.frame = frame - frame.obj = self - - self.OnAcquire = OnAcquire - self.OnRelease = OnRelease - - self.AddItem = AddItem - self.Open = Open - self.Close = Close - self.Clear = Clear - self.IterateItems = IterateItems - self.SetHideOnLeave = SetHideOnLeave - - self.SetScroll = SetScroll - self.MoveScroll = MoveScroll - self.FixScroll = FixScroll - - self.SetMaxHeight = SetMaxHeight - self.GetRightBorderWidth = GetRightBorderWidth - self.GetLeftBorderWidth = GetLeftBorderWidth - - self.items = {} - - self.scrollStatus = { - scrollvalue = 0, - } - - self.maxHeight = defaultMaxHeight - - frame:SetBackdrop(backdrop) - frame:SetBackdropColor(0, 0, 0) - frame:SetFrameStrata("FULLSCREEN_DIALOG") - frame:SetClampedToScreen(true) - frame:SetWidth(defaultWidth) - frame:SetHeight(self.maxHeight) - --frame:SetToplevel(true) - - -- NOTE: The whole scroll frame code is copied from the AceGUI-3.0 widget ScrollFrame - local scrollFrame = CreateFrame("ScrollFrame", nil, frame) - local itemFrame = CreateFrame("Frame", nil, scrollFrame) - - self.scrollFrame = scrollFrame - self.itemFrame = itemFrame - - scrollFrame.obj = self - itemFrame.obj = self - - local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame) - slider:SetOrientation("VERTICAL") - slider:SetHitRectInsets(0, 0, -10, 0) - slider:SetBackdrop(sliderBackdrop) - slider:SetWidth(8) - slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Vertical") - slider:SetFrameStrata("FULLSCREEN_DIALOG") - self.slider = slider - slider.obj = self - - scrollFrame:SetScrollChild(itemFrame) - 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) - scrollFrame:SetToplevel(true) - scrollFrame:SetFrameStrata("FULLSCREEN_DIALOG") - - itemFrame:SetPoint("TOPLEFT", scrollFrame, "TOPLEFT", 0, 0) - itemFrame:SetPoint("TOPRIGHT", scrollFrame, "TOPRIGHT", -12, 0) - itemFrame:SetHeight(400) - itemFrame:SetToplevel(true) - itemFrame:SetFrameStrata("FULLSCREEN_DIALOG") - - slider:SetPoint("TOPLEFT", scrollFrame, "TOPRIGHT", -16, 0) - slider:SetPoint("BOTTOMLEFT", scrollFrame, "BOTTOMRIGHT", -16, 0) - slider:SetScript("OnValueChanged", OnScrollValueChanged) - slider:SetMinMaxValues(0, 1000) - slider:SetValueStep(1) - slider:SetValue(0) - - scrollFrame:Show() - itemFrame:Show() - slider:Hide() - - self:FixScroll() - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) -end - -do - local widgetType = "Dropdown" - local widgetVersion = 31 - - --[[ Static data ]]-- - - --[[ UI event handler ]]-- - - local function Control_OnEnter(this) - this.obj.button:LockHighlight() - this.obj:Fire("OnEnter") - end - - local function Control_OnLeave(this) - this.obj.button:UnlockHighlight() - this.obj:Fire("OnLeave") - end - - local function Dropdown_OnHide(this) - local self = this.obj - if self.open then - self.pullout:Close() - end - end - - local function Dropdown_TogglePullout(this) - local self = this.obj - PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON - if self.open then - self.open = nil - self.pullout:Close() - AceGUI:ClearFocus() - else - self.open = true - self.pullout:SetWidth(self.pulloutWidth or self.frame:GetWidth()) - self.pullout:Open("TOPLEFT", self.frame, "BOTTOMLEFT", 0, self.label:IsShown() and -2 or 0) - AceGUI:SetFocus(self) - end - end - - local function OnPulloutOpen(this) - local self = this.userdata.obj - local value = self.value - - if not self.multiselect then - for i, item in this:IterateItems() do - item:SetValue(item.userdata.value == value) - end - end - - self.open = true - self:Fire("OnOpened") - end - - local function OnPulloutClose(this) - local self = this.userdata.obj - self.open = nil - self:Fire("OnClosed") - end - - local function ShowMultiText(self) - local text - for i, widget in self.pullout:IterateItems() do - if widget.type == "Dropdown-Item-Toggle" then - if widget:GetValue() then - if text then - text = text..", "..widget:GetText() - else - text = widget:GetText() - end - end - end - end - self:SetText(text) - end - - local function OnItemValueChanged(this, event, checked) - local self = this.userdata.obj - - if self.multiselect then - self:Fire("OnValueChanged", this.userdata.value, checked) - ShowMultiText(self) - else - if checked then - self:SetValue(this.userdata.value) - self:Fire("OnValueChanged", this.userdata.value) - else - this:SetValue(true) - end - if self.open then - self.pullout:Close() - end - end - end - - --[[ Exported methods ]]-- - - -- exported, AceGUI callback - local function OnAcquire(self) - local pullout = AceGUI:Create("Dropdown-Pullout") - self.pullout = pullout - pullout.userdata.obj = self - pullout:SetCallback("OnClose", OnPulloutClose) - pullout:SetCallback("OnOpen", OnPulloutOpen) - self.pullout.frame:SetFrameLevel(self.frame:GetFrameLevel() + 1) - fixlevels(self.pullout.frame, self.pullout.frame:GetChildren()) - - self:SetHeight(44) - self:SetWidth(200) - self:SetLabel() - self:SetPulloutWidth(nil) - end - - -- exported, AceGUI callback - local function OnRelease(self) - if self.open then - self.pullout:Close() - end - AceGUI:Release(self.pullout) - self.pullout = nil - - self:SetText("") - self:SetDisabled(false) - self:SetMultiselect(false) - - self.value = nil - self.list = nil - self.open = nil - self.hasClose = nil - - self.frame:ClearAllPoints() - self.frame:Hide() - end - - -- exported - local function SetDisabled(self, disabled) - self.disabled = disabled - if disabled then - self.text:SetTextColor(0.5,0.5,0.5) - self.button:Disable() - self.button_cover:Disable() - self.label:SetTextColor(0.5,0.5,0.5) - else - self.button:Enable() - self.button_cover:Enable() - self.label:SetTextColor(1,.82,0) - self.text:SetTextColor(1,1,1) - end - end - - -- exported - local function ClearFocus(self) - if self.open then - self.pullout:Close() - end - end - - -- exported - local function SetText(self, text) - self.text:SetText(text or "") - end - - -- exported - local function SetLabel(self, text) - if text and text ~= "" then - self.label:SetText(text) - self.label:Show() - self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,-14) - self:SetHeight(40) - self.alignoffset = 26 - else - self.label:SetText("") - self.label:Hide() - self.dropdown:SetPoint("TOPLEFT",self.frame,"TOPLEFT",-15,0) - self:SetHeight(26) - self.alignoffset = 12 - end - end - - -- exported - local function SetValue(self, value) - if self.list then - self:SetText(self.list[value] or "") - end - self.value = value - end - - -- exported - local function GetValue(self) - return self.value - end - - -- exported - local function SetItemValue(self, item, value) - if not self.multiselect then return end - for i, widget in self.pullout:IterateItems() do - if widget.userdata.value == item then - if widget.SetValue then - widget:SetValue(value) - end - end - end - ShowMultiText(self) - end - - -- exported - local function SetItemDisabled(self, item, disabled) - for i, widget in self.pullout:IterateItems() do - if widget.userdata.value == item then - widget:SetDisabled(disabled) - end - end - end - - local function AddListItem(self, value, text, itemType) - if not itemType then itemType = "Dropdown-Item-Toggle" end - local exists = AceGUI:GetWidgetVersion(itemType) - if not exists then error(("The given item type, %q, does not exist within AceGUI-3.0"):format(tostring(itemType)), 2) end - - local item = AceGUI:Create(itemType) - item:SetText(text) - item.userdata.obj = self - item.userdata.value = value - item:SetCallback("OnValueChanged", OnItemValueChanged) - self.pullout:AddItem(item) - end - - local function AddCloseButton(self) - if not self.hasClose then - local close = AceGUI:Create("Dropdown-Item-Execute") - close:SetText(CLOSE) - self.pullout:AddItem(close) - self.hasClose = true - end - end - - -- exported - local sortlist = {} - local function SetList(self, list, order, itemType) - self.list = list - self.pullout:Clear() - self.hasClose = nil - if not list then return end - - if type(order) ~= "table" then - for v in pairs(list) do - sortlist[#sortlist + 1] = v - end - tsort(sortlist) - - for i, key in ipairs(sortlist) do - AddListItem(self, key, list[key], itemType) - sortlist[i] = nil - end - else - for i, key in ipairs(order) do - AddListItem(self, key, list[key], itemType) - end - end - if self.multiselect then - ShowMultiText(self) - AddCloseButton(self) - end - end - - -- exported - local function AddItem(self, value, text, itemType) - if self.list then - self.list[value] = text - AddListItem(self, value, text, itemType) - end - end - - -- exported - local function SetMultiselect(self, multi) - self.multiselect = multi - if multi then - ShowMultiText(self) - AddCloseButton(self) - end - end - - -- exported - local function GetMultiselect(self) - return self.multiselect - end - - local function SetPulloutWidth(self, width) - self.pulloutWidth = width - end - - --[[ Constructor ]]-- - - local function Constructor() - local count = AceGUI:GetNextWidgetNum(widgetType) - local frame = CreateFrame("Frame", nil, UIParent) - local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate") - - local self = {} - self.type = widgetType - self.frame = frame - self.dropdown = dropdown - self.count = count - frame.obj = self - dropdown.obj = self - - self.OnRelease = OnRelease - self.OnAcquire = OnAcquire - - self.ClearFocus = ClearFocus - - self.SetText = SetText - self.SetValue = SetValue - self.GetValue = GetValue - self.SetList = SetList - self.SetLabel = SetLabel - self.SetDisabled = SetDisabled - self.AddItem = AddItem - self.SetMultiselect = SetMultiselect - self.GetMultiselect = GetMultiselect - self.SetItemValue = SetItemValue - self.SetItemDisabled = SetItemDisabled - self.SetPulloutWidth = SetPulloutWidth - - self.alignoffset = 26 - - frame:SetScript("OnHide",Dropdown_OnHide) - - dropdown:ClearAllPoints() - dropdown:SetPoint("TOPLEFT",frame,"TOPLEFT",-15,0) - dropdown:SetPoint("BOTTOMRIGHT",frame,"BOTTOMRIGHT",17,0) - dropdown:SetScript("OnHide", nil) - - local left = _G[dropdown:GetName() .. "Left"] - local middle = _G[dropdown:GetName() .. "Middle"] - local right = _G[dropdown:GetName() .. "Right"] - - middle:ClearAllPoints() - right:ClearAllPoints() - - middle:SetPoint("LEFT", left, "RIGHT", 0, 0) - middle:SetPoint("RIGHT", right, "LEFT", 0, 0) - right:SetPoint("TOPRIGHT", dropdown, "TOPRIGHT", 0, 17) - - local button = _G[dropdown:GetName() .. "Button"] - self.button = button - button.obj = self - button:SetScript("OnEnter",Control_OnEnter) - button:SetScript("OnLeave",Control_OnLeave) - button:SetScript("OnClick",Dropdown_TogglePullout) - - local button_cover = CreateFrame("BUTTON",nil,self.frame) - self.button_cover = button_cover - button_cover.obj = self - button_cover:SetPoint("TOPLEFT",self.frame,"BOTTOMLEFT",0,25) - button_cover:SetPoint("BOTTOMRIGHT",self.frame,"BOTTOMRIGHT") - button_cover:SetScript("OnEnter",Control_OnEnter) - button_cover:SetScript("OnLeave",Control_OnLeave) - button_cover:SetScript("OnClick",Dropdown_TogglePullout) - - local text = _G[dropdown:GetName() .. "Text"] - self.text = text - text.obj = self - text:ClearAllPoints() - text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2) - text:SetPoint("LEFT", left, "LEFT", 25, 2) - - local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") - label:SetPoint("TOPLEFT",frame,"TOPLEFT",0,0) - label:SetPoint("TOPRIGHT",frame,"TOPRIGHT",0,0) - label:SetJustifyH("LEFT") - label:SetHeight(18) - label:Hide() - self.label = label - - AceGUI:RegisterAsWidget(self) - return self - end - - AceGUI:RegisterWidgetType(widgetType, Constructor, widgetVersion) -end diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua deleted file mode 100755 index cc1b6a3..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua +++ /dev/null @@ -1,263 +0,0 @@ ---[[----------------------------------------------------------------------------- -EditBox Widget --------------------------------------------------------------------------------]] -local Type, Version = "EditBox", 28 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local tostring, pairs = tostring, pairs - --- WoW APIs -local PlaySound = PlaySound -local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -if not AceGUIEditBoxInsertLink then - -- upgradeable hook - hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end) -end - -function _G.AceGUIEditBoxInsertLink(text) - for i = 1, AceGUI:GetWidgetCount(Type) do - local editbox = _G["AceGUI-3.0EditBox"..i] - if editbox and editbox:IsVisible() and editbox:HasFocus() then - editbox:Insert(text) - return true - end - end -end - -local function ShowButton(self) - if not self.disablebutton then - self.button:Show() - self.editbox:SetTextInsets(0, 20, 3, 3) - end -end - -local function HideButton(self) - self.button:Hide() - self.editbox:SetTextInsets(0, 0, 3, 3) -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Frame_OnShowFocus(frame) - frame.obj.editbox:SetFocus() - frame:SetScript("OnShow", nil) -end - -local function EditBox_OnEscapePressed(frame) - AceGUI:ClearFocus() -end - -local function EditBox_OnEnterPressed(frame) - local self = frame.obj - local value = frame:GetText() - local cancel = self:Fire("OnEnterPressed", value) - if not cancel then - PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON - HideButton(self) - end -end - -local function EditBox_OnReceiveDrag(frame) - local self = frame.obj - local type, id, info = GetCursorInfo() - local name - if type == "item" then - name = info - elseif type == "spell" then - name = GetSpellInfo(id, info) - elseif type == "macro" then - name = GetMacroInfo(id) - end - if name then - self:SetText(name) - self:Fire("OnEnterPressed", name) - ClearCursor() - HideButton(self) - AceGUI:ClearFocus() - end -end - -local function EditBox_OnTextChanged(frame) - local self = frame.obj - local value = frame:GetText() - if tostring(value) ~= tostring(self.lasttext) then - self:Fire("OnTextChanged", value) - self.lasttext = value - ShowButton(self) - end -end - -local function EditBox_OnFocusGained(frame) - AceGUI:SetFocus(frame.obj) -end - -local function Button_OnClick(frame) - local editbox = frame.obj.editbox - editbox:ClearFocus() - EditBox_OnEnterPressed(editbox) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- height is controlled by SetLabel - self:SetWidth(200) - self:SetDisabled(false) - self:SetLabel() - self:SetText() - self:DisableButton(false) - self:SetMaxLetters(0) - end, - - ["OnRelease"] = function(self) - self:ClearFocus() - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.editbox:EnableMouse(false) - self.editbox:ClearFocus() - self.editbox:SetTextColor(0.5,0.5,0.5) - self.label:SetTextColor(0.5,0.5,0.5) - else - self.editbox:EnableMouse(true) - self.editbox:SetTextColor(1,1,1) - self.label:SetTextColor(1,.82,0) - end - end, - - ["SetText"] = function(self, text) - self.lasttext = text or "" - self.editbox:SetText(text or "") - self.editbox:SetCursorPosition(0) - HideButton(self) - end, - - ["GetText"] = function(self, text) - return self.editbox:GetText() - end, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:SetText(text) - self.label:Show() - self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,-18) - self:SetHeight(44) - self.alignoffset = 30 - else - self.label:SetText("") - self.label:Hide() - self.editbox:SetPoint("TOPLEFT",self.frame,"TOPLEFT",7,0) - self:SetHeight(26) - self.alignoffset = 12 - end - end, - - ["DisableButton"] = function(self, disabled) - self.disablebutton = disabled - if disabled then - HideButton(self) - end - end, - - ["SetMaxLetters"] = function (self, num) - self.editbox:SetMaxLetters(num or 0) - end, - - ["ClearFocus"] = function(self) - self.editbox:ClearFocus() - self.frame:SetScript("OnShow", nil) - end, - - ["SetFocus"] = function(self) - self.editbox:SetFocus() - if not self.frame:IsShown() then - self.frame:SetScript("OnShow", Frame_OnShowFocus) - end - end, - - ["HighlightText"] = function(self, from, to) - self.editbox:HighlightText(from, to) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local num = AceGUI:GetNextWidgetNum(Type) - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate") - editbox:SetAutoFocus(false) - editbox:SetFontObject(ChatFontNormal) - editbox:SetScript("OnEnter", Control_OnEnter) - editbox:SetScript("OnLeave", Control_OnLeave) - editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) - editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) - editbox:SetScript("OnTextChanged", EditBox_OnTextChanged) - editbox:SetScript("OnReceiveDrag", EditBox_OnReceiveDrag) - editbox:SetScript("OnMouseDown", EditBox_OnReceiveDrag) - editbox:SetScript("OnEditFocusGained", EditBox_OnFocusGained) - editbox:SetTextInsets(0, 0, 3, 3) - editbox:SetMaxLetters(256) - editbox:SetPoint("BOTTOMLEFT", 6, 0) - editbox:SetPoint("BOTTOMRIGHT") - editbox:SetHeight(19) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") - label:SetPoint("TOPLEFT", 0, -2) - label:SetPoint("TOPRIGHT", 0, -2) - label:SetJustifyH("LEFT") - label:SetHeight(18) - - local button = CreateFrame("Button", nil, editbox, "UIPanelButtonTemplate") - button:SetWidth(40) - button:SetHeight(20) - button:SetPoint("RIGHT", -2, 0) - button:SetText(OKAY) - button:SetScript("OnClick", Button_OnClick) - button:Hide() - - local widget = { - alignoffset = 30, - editbox = editbox, - label = label, - button = button, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - editbox.obj, button.obj = widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua deleted file mode 100755 index 670cd4e..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua +++ /dev/null @@ -1,78 +0,0 @@ ---[[----------------------------------------------------------------------------- -Heading Widget --------------------------------------------------------------------------------]] -local Type, Version = "Heading", 20 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetText() - self:SetFullWidth() - self:SetHeight(18) - end, - - -- ["OnRelease"] = nil, - - ["SetText"] = function(self, text) - self.label:SetText(text or "") - if text and text ~= "" then - self.left:SetPoint("RIGHT", self.label, "LEFT", -5, 0) - self.right:Show() - else - self.left:SetPoint("RIGHT", -3, 0) - self.right:Hide() - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontNormal") - label:SetPoint("TOP") - label:SetPoint("BOTTOM") - label:SetJustifyH("CENTER") - - local left = frame:CreateTexture(nil, "BACKGROUND") - left:SetHeight(8) - left:SetPoint("LEFT", 3, 0) - left:SetPoint("RIGHT", label, "LEFT", -5, 0) - left:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - left:SetTexCoord(0.81, 0.94, 0.5, 1) - - local right = frame:CreateTexture(nil, "BACKGROUND") - right:SetHeight(8) - right:SetPoint("RIGHT", -3, 0) - right:SetPoint("LEFT", label, "RIGHT", 5, 0) - right:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border - right:SetTexCoord(0.81, 0.94, 0.5, 1) - - local widget = { - label = label, - left = left, - right = right, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua deleted file mode 100755 index 092697e..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua +++ /dev/null @@ -1,140 +0,0 @@ ---[[----------------------------------------------------------------------------- -Icon Widget --------------------------------------------------------------------------------]] -local Type, Version = "Icon", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs, print = select, pairs, print - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Button_OnClick(frame, button) - frame.obj:Fire("OnClick", button) - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetHeight(110) - self:SetWidth(110) - self:SetLabel() - self:SetImage(nil) - self:SetImageSize(64, 64) - self:SetDisabled(false) - end, - - -- ["OnRelease"] = nil, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:Show() - self.label:SetText(text) - self:SetHeight(self.image:GetHeight() + 25) - else - self.label:Hide() - self:SetHeight(self.image:GetHeight() + 10) - end - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - end - end, - - ["SetImageSize"] = function(self, width, height) - self.image:SetWidth(width) - self.image:SetHeight(height) - --self.frame:SetWidth(width + 30) - if self.label:IsShown() then - self:SetHeight(height + 25) - else - self:SetHeight(height + 10) - end - end, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.frame:Disable() - self.label:SetTextColor(0.5, 0.5, 0.5) - self.image:SetVertexColor(0.5, 0.5, 0.5, 0.5) - else - self.frame:Enable() - self.label:SetTextColor(1, 1, 1) - self.image:SetVertexColor(1, 1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Button", nil, UIParent) - frame:Hide() - - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnClick", Button_OnClick) - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlight") - label:SetPoint("BOTTOMLEFT") - label:SetPoint("BOTTOMRIGHT") - label:SetJustifyH("CENTER") - label:SetJustifyV("TOP") - label:SetHeight(18) - - local image = frame:CreateTexture(nil, "BACKGROUND") - image:SetWidth(64) - image:SetHeight(64) - image:SetPoint("TOP", 0, -5) - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetAllPoints(image) - highlight:SetTexture(136580) -- Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight - highlight:SetTexCoord(0, 1, 0.23, 0.77) - highlight:SetBlendMode("ADD") - - local widget = { - label = label, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua deleted file mode 100755 index 76a2cf9..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua +++ /dev/null @@ -1,94 +0,0 @@ ---[[----------------------------------------------------------------------------- -InteractiveLabel Widget --------------------------------------------------------------------------------]] -local Type, Version = "InteractiveLabel", 21 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local select, pairs = select, pairs - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Label_OnClick(frame, button) - frame.obj:Fire("OnClick", button) - AceGUI:ClearFocus() -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:LabelOnAcquire() - self:SetHighlight() - self:SetHighlightTexCoord() - self:SetDisabled(false) - end, - - -- ["OnRelease"] = nil, - - ["SetHighlight"] = function(self, ...) - self.highlight:SetTexture(...) - end, - - ["SetHighlightTexCoord"] = function(self, ...) - local c = select("#", ...) - if c == 4 or c == 8 then - self.highlight:SetTexCoord(...) - else - self.highlight:SetTexCoord(0, 1, 0, 1) - end - end, - - ["SetDisabled"] = function(self,disabled) - self.disabled = disabled - if disabled then - self.frame:EnableMouse(false) - self.label:SetTextColor(0.5, 0.5, 0.5) - else - self.frame:EnableMouse(true) - self.label:SetTextColor(1, 1, 1) - end - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - -- create a Label type that we will hijack - local label = AceGUI:Create("Label") - - local frame = label.frame - frame:EnableMouse(true) - frame:SetScript("OnEnter", Control_OnEnter) - frame:SetScript("OnLeave", Control_OnLeave) - frame:SetScript("OnMouseDown", Label_OnClick) - - local highlight = frame:CreateTexture(nil, "HIGHLIGHT") - highlight:SetTexture(nil) - highlight:SetAllPoints() - highlight:SetBlendMode("ADD") - - label.highlight = highlight - label.type = Type - label.LabelOnAcquire = label.OnAcquire - for method, func in pairs(methods) do - label[method] = func - end - - return label -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) - diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua deleted file mode 100755 index e77023a..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua +++ /dev/null @@ -1,249 +0,0 @@ ---[[----------------------------------------------------------------------------- -Keybinding Widget -Set Keybindings in the Config UI. --------------------------------------------------------------------------------]] -local Type, Version = "Keybinding", 25 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: NOT_BOUND - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] - -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Keybinding_OnClick(frame, button) - if button == "LeftButton" or button == "RightButton" then - local self = frame.obj - if self.waitingForKey then - frame:EnableKeyboard(false) - frame:EnableMouseWheel(false) - self.msgframe:Hide() - frame:UnlockHighlight() - self.waitingForKey = nil - else - frame:EnableKeyboard(true) - frame:EnableMouseWheel(true) - self.msgframe:Show() - frame:LockHighlight() - self.waitingForKey = true - end - end - AceGUI:ClearFocus() -end - -local ignoreKeys = { - ["BUTTON1"] = true, ["BUTTON2"] = true, - ["UNKNOWN"] = true, - ["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true, - ["RSHIFT"] = true, ["RCTRL"] = true, ["RALT"] = true, -} -local function Keybinding_OnKeyDown(frame, key) - local self = frame.obj - if self.waitingForKey then - local keyPressed = key - if keyPressed == "ESCAPE" then - keyPressed = "" - else - if ignoreKeys[keyPressed] then return end - if IsShiftKeyDown() then - keyPressed = "SHIFT-"..keyPressed - end - if IsControlKeyDown() then - keyPressed = "CTRL-"..keyPressed - end - if IsAltKeyDown() then - keyPressed = "ALT-"..keyPressed - end - end - - frame:EnableKeyboard(false) - frame:EnableMouseWheel(false) - self.msgframe:Hide() - frame:UnlockHighlight() - self.waitingForKey = nil - - if not self.disabled then - self:SetKey(keyPressed) - self:Fire("OnKeyChanged", keyPressed) - end - end -end - -local function Keybinding_OnMouseDown(frame, button) - if button == "LeftButton" or button == "RightButton" then - return - elseif button == "MiddleButton" then - button = "BUTTON3" - elseif button == "Button4" then - button = "BUTTON4" - elseif button == "Button5" then - button = "BUTTON5" - end - Keybinding_OnKeyDown(frame, button) -end - -local function Keybinding_OnMouseWheel(frame, direction) - local button - if direction >= 0 then - button = "MOUSEWHEELUP" - else - button = "MOUSEWHEELDOWN" - end - Keybinding_OnKeyDown(frame, button) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(200) - self:SetLabel("") - self:SetKey("") - self.waitingForKey = nil - self.msgframe:Hide() - self:SetDisabled(false) - self.button:EnableKeyboard(false) - self.button:EnableMouseWheel(false) - end, - - -- ["OnRelease"] = nil, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.button:Disable() - self.label:SetTextColor(0.5,0.5,0.5) - else - self.button:Enable() - self.label:SetTextColor(1,1,1) - end - end, - - ["SetKey"] = function(self, key) - if (key or "") == "" then - self.button:SetText(NOT_BOUND) - self.button:SetNormalFontObject("GameFontNormal") - else - self.button:SetText(key) - self.button:SetNormalFontObject("GameFontHighlight") - end - end, - - ["GetKey"] = function(self) - local key = self.button:GetText() - if key == NOT_BOUND then - key = nil - end - return key - end, - - ["SetLabel"] = function(self, label) - self.label:SetText(label or "") - if (label or "") == "" then - self.alignoffset = nil - self:SetHeight(24) - else - self.alignoffset = 30 - self:SetHeight(44) - end - end, -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] - -local ControlBackdrop = { - bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", - edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border", - tile = true, tileSize = 16, edgeSize = 16, - insets = { left = 3, right = 3, top = 3, bottom = 3 } -} - -local function keybindingMsgFixWidth(frame) - frame:SetWidth(frame.msg:GetWidth() + 10) - frame:SetScript("OnUpdate", nil) -end - -local function Constructor() - local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) - - local frame = CreateFrame("Frame", nil, UIParent) - local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate") - - button:EnableMouse(true) - button:EnableMouseWheel(false) - button:RegisterForClicks("AnyDown") - button:SetScript("OnEnter", Control_OnEnter) - button:SetScript("OnLeave", Control_OnLeave) - button:SetScript("OnClick", Keybinding_OnClick) - button:SetScript("OnKeyDown", Keybinding_OnKeyDown) - button:SetScript("OnMouseDown", Keybinding_OnMouseDown) - button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel) - button:SetPoint("BOTTOMLEFT") - button:SetPoint("BOTTOMRIGHT") - button:SetHeight(24) - button:EnableKeyboard(false) - - local text = button:GetFontString() - text:SetPoint("LEFT", 7, 0) - text:SetPoint("RIGHT", -7, 0) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight") - label:SetPoint("TOPLEFT") - label:SetPoint("TOPRIGHT") - label:SetJustifyH("CENTER") - label:SetHeight(18) - - local msgframe = CreateFrame("Frame", nil, UIParent) - msgframe:SetHeight(30) - msgframe:SetBackdrop(ControlBackdrop) - msgframe:SetBackdropColor(0,0,0) - msgframe:SetFrameStrata("FULLSCREEN_DIALOG") - msgframe:SetFrameLevel(1000) - msgframe:SetToplevel(true) - - local msg = msgframe:CreateFontString(nil, "OVERLAY", "GameFontNormal") - msg:SetText("Press a key to bind, ESC to clear the binding or click the button again to cancel.") - msgframe.msg = msg - msg:SetPoint("TOPLEFT", 5, -5) - msgframe:SetScript("OnUpdate", keybindingMsgFixWidth) - msgframe:SetPoint("BOTTOM", button, "TOP") - msgframe:Hide() - - local widget = { - button = button, - label = label, - msgframe = msgframe, - frame = frame, - alignoffset = 30, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - button.obj = widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua deleted file mode 100755 index 79fddc4..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua +++ /dev/null @@ -1,178 +0,0 @@ ---[[----------------------------------------------------------------------------- -Label Widget -Displays text and optionally an icon. --------------------------------------------------------------------------------]] -local Type, Version = "Label", 26 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local max, select, pairs = math.max, select, pairs - --- WoW APIs -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] - -local function UpdateImageAnchor(self) - if self.resizing then return end - local frame = self.frame - local width = frame.width or frame:GetWidth() or 0 - local image = self.image - local label = self.label - local height - - label:ClearAllPoints() - image:ClearAllPoints() - - if self.imageshown then - local imagewidth = image:GetWidth() - if (width - imagewidth) < 200 or (label:GetText() or "") == "" then - -- image goes on top centered when less than 200 width for the text, or if there is no text - image:SetPoint("TOP") - label:SetPoint("TOP", image, "BOTTOM") - label:SetPoint("LEFT") - label:SetWidth(width) - height = image:GetHeight() + label:GetStringHeight() - else - -- image on the left - image:SetPoint("TOPLEFT") - if image:GetHeight() > label:GetStringHeight() then - label:SetPoint("LEFT", image, "RIGHT", 4, 0) - else - label:SetPoint("TOPLEFT", image, "TOPRIGHT", 4, 0) - end - label:SetWidth(width - imagewidth - 4) - height = max(image:GetHeight(), label:GetStringHeight()) - end - else - -- no image shown - label:SetPoint("TOPLEFT") - label:SetWidth(width) - height = label:GetStringHeight() - end - - -- avoid zero-height labels, since they can used as spacers - if not height or height == 0 then - height = 1 - end - - self.resizing = true - frame:SetHeight(height) - frame.height = height - self.resizing = nil -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - -- set the flag to stop constant size updates - self.resizing = true - -- height is set dynamically by the text and image size - self:SetWidth(200) - self:SetText() - self:SetImage(nil) - self:SetImageSize(16, 16) - self:SetColor() - self:SetFontObject() - self:SetJustifyH("LEFT") - self:SetJustifyV("TOP") - - -- reset the flag - self.resizing = nil - -- run the update explicitly - UpdateImageAnchor(self) - end, - - -- ["OnRelease"] = nil, - - ["OnWidthSet"] = function(self, width) - UpdateImageAnchor(self) - end, - - ["SetText"] = function(self, text) - self.label:SetText(text) - UpdateImageAnchor(self) - end, - - ["SetColor"] = function(self, r, g, b) - if not (r and g and b) then - r, g, b = 1, 1, 1 - end - self.label:SetVertexColor(r, g, b) - end, - - ["SetImage"] = function(self, path, ...) - local image = self.image - image:SetTexture(path) - - if image:GetTexture() then - self.imageshown = true - local n = select("#", ...) - if n == 4 or n == 8 then - image:SetTexCoord(...) - else - image:SetTexCoord(0, 1, 0, 1) - end - else - self.imageshown = nil - end - UpdateImageAnchor(self) - end, - - ["SetFont"] = function(self, font, height, flags) - self.label:SetFont(font, height, flags) - end, - - ["SetFontObject"] = function(self, font) - self:SetFont((font or GameFontHighlightSmall):GetFont()) - end, - - ["SetImageSize"] = function(self, width, height) - self.image:SetWidth(width) - self.image:SetHeight(height) - UpdateImageAnchor(self) - end, - - ["SetJustifyH"] = function(self, justifyH) - self.label:SetJustifyH(justifyH) - end, - - ["SetJustifyV"] = function(self, justifyV) - self.label:SetJustifyV(justifyV) - end, -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local label = frame:CreateFontString(nil, "BACKGROUND", "GameFontHighlightSmall") - local image = frame:CreateTexture(nil, "BACKGROUND") - - -- create widget - local widget = { - label = label, - image = image, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua deleted file mode 100755 index 46a75b1..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua +++ /dev/null @@ -1,366 +0,0 @@ -local Type, Version = "MultiLineEditBox", 28 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local pairs = pairs - --- WoW APIs -local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor -local CreateFrame, UIParent = CreateFrame, UIParent -local _G = _G - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: ACCEPT, ChatFontNormal - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] - -if not AceGUIMultiLineEditBoxInsertLink then - -- upgradeable hook - hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end) -end - -function _G.AceGUIMultiLineEditBoxInsertLink(text) - for i = 1, AceGUI:GetWidgetCount(Type) do - local editbox = _G[("MultiLineEditBox%uEdit"):format(i)] - if editbox and editbox:IsVisible() and editbox:HasFocus() then - editbox:Insert(text) - return true - end - end -end - - -local function Layout(self) - self:SetHeight(self.numlines * 14 + (self.disablebutton and 19 or 41) + self.labelHeight) - - if self.labelHeight == 0 then - self.scrollBar:SetPoint("TOP", self.frame, "TOP", 0, -23) - else - self.scrollBar:SetPoint("TOP", self.label, "BOTTOM", 0, -19) - end - - if self.disablebutton then - self.scrollBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 21) - self.scrollBG:SetPoint("BOTTOMLEFT", 0, 4) - else - self.scrollBar:SetPoint("BOTTOM", self.button, "TOP", 0, 18) - self.scrollBG:SetPoint("BOTTOMLEFT", self.button, "TOPLEFT") - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function OnClick(self) -- Button - self = self.obj - self.editBox:ClearFocus() - if not self:Fire("OnEnterPressed", self.editBox:GetText()) then - self.button:Disable() - end -end - -local function OnCursorChanged(self, _, y, _, cursorHeight) -- EditBox - self, y = self.obj.scrollFrame, -y - local offset = self:GetVerticalScroll() - if y < offset then - self:SetVerticalScroll(y) - else - y = y + cursorHeight - self:GetHeight() - if y > offset then - self:SetVerticalScroll(y) - end - end -end - -local function OnEditFocusLost(self) -- EditBox - self:HighlightText(0, 0) - self.obj:Fire("OnEditFocusLost") -end - -local function OnEnter(self) -- EditBox / ScrollFrame - self = self.obj - if not self.entered then - self.entered = true - self:Fire("OnEnter") - end -end - -local function OnLeave(self) -- EditBox / ScrollFrame - self = self.obj - if self.entered then - self.entered = nil - self:Fire("OnLeave") - end -end - -local function OnMouseUp(self) -- ScrollFrame - self = self.obj.editBox - self:SetFocus() - self:SetCursorPosition(self:GetNumLetters()) -end - -local function OnReceiveDrag(self) -- EditBox / ScrollFrame - local type, id, info = GetCursorInfo() - if type == "spell" then - info = GetSpellInfo(id, info) - elseif type ~= "item" then - return - end - ClearCursor() - self = self.obj - local editBox = self.editBox - if not editBox:HasFocus() then - editBox:SetFocus() - editBox:SetCursorPosition(editBox:GetNumLetters()) - end - editBox:Insert(info) - self.button:Enable() -end - -local function OnSizeChanged(self, width, height) -- ScrollFrame - self.obj.editBox:SetWidth(width) -end - -local function OnTextChanged(self, userInput) -- EditBox - if userInput then - self = self.obj - self:Fire("OnTextChanged", self.editBox:GetText()) - self.button:Enable() - end -end - -local function OnTextSet(self) -- EditBox - self:HighlightText(0, 0) - self:SetCursorPosition(self:GetNumLetters()) - self:SetCursorPosition(0) - self.obj.button:Disable() -end - -local function OnVerticalScroll(self, offset) -- ScrollFrame - local editBox = self.obj.editBox - editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight()) -end - -local function OnShowFocus(frame) - frame.obj.editBox:SetFocus() - frame:SetScript("OnShow", nil) -end - -local function OnEditFocusGained(frame) - AceGUI:SetFocus(frame.obj) - frame.obj:Fire("OnEditFocusGained") -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self.editBox:SetText("") - self:SetDisabled(false) - self:SetWidth(200) - self:DisableButton(false) - self:SetNumLines() - self.entered = nil - self:SetMaxLetters(0) - end, - - ["OnRelease"] = function(self) - self:ClearFocus() - end, - - ["SetDisabled"] = function(self, disabled) - local editBox = self.editBox - if disabled then - editBox:ClearFocus() - editBox:EnableMouse(false) - editBox:SetTextColor(0.5, 0.5, 0.5) - self.label:SetTextColor(0.5, 0.5, 0.5) - self.scrollFrame:EnableMouse(false) - self.button:Disable() - else - editBox:EnableMouse(true) - editBox:SetTextColor(1, 1, 1) - self.label:SetTextColor(1, 0.82, 0) - self.scrollFrame:EnableMouse(true) - end - end, - - ["SetLabel"] = function(self, text) - if text and text ~= "" then - self.label:SetText(text) - if self.labelHeight ~= 10 then - self.labelHeight = 10 - self.label:Show() - end - elseif self.labelHeight ~= 0 then - self.labelHeight = 0 - self.label:Hide() - end - Layout(self) - end, - - ["SetNumLines"] = function(self, value) - if not value or value < 4 then - value = 4 - end - self.numlines = value - Layout(self) - end, - - ["SetText"] = function(self, text) - self.editBox:SetText(text) - end, - - ["GetText"] = function(self) - return self.editBox:GetText() - end, - - ["SetMaxLetters"] = function (self, num) - self.editBox:SetMaxLetters(num or 0) - end, - - ["DisableButton"] = function(self, disabled) - self.disablebutton = disabled - if disabled then - self.button:Hide() - else - self.button:Show() - end - Layout(self) - end, - - ["ClearFocus"] = function(self) - self.editBox:ClearFocus() - self.frame:SetScript("OnShow", nil) - end, - - ["SetFocus"] = function(self) - self.editBox:SetFocus() - if not self.frame:IsShown() then - self.frame:SetScript("OnShow", OnShowFocus) - end - end, - - ["HighlightText"] = function(self, from, to) - self.editBox:HighlightText(from, to) - end, - - ["GetCursorPosition"] = function(self) - return self.editBox:GetCursorPosition() - end, - - ["SetCursorPosition"] = function(self, ...) - return self.editBox:SetCursorPosition(...) - end, - - -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local backdrop = { - bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], - edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]], edgeSize = 16, - insets = { left = 4, right = 3, top = 4, bottom = 3 } -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - frame:Hide() - - local widgetNum = AceGUI:GetNextWidgetNum(Type) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall") - label:SetPoint("TOPLEFT", frame, "TOPLEFT", 0, -4) - label:SetPoint("TOPRIGHT", frame, "TOPRIGHT", 0, -4) - label:SetJustifyH("LEFT") - label:SetText(ACCEPT) - label:SetHeight(10) - - local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate") - button:SetPoint("BOTTOMLEFT", 0, 4) - button:SetHeight(22) - button:SetWidth(label:GetStringWidth() + 24) - button:SetText(ACCEPT) - button:SetScript("OnClick", OnClick) - button:Disable() - - local text = button:GetFontString() - text:ClearAllPoints() - text:SetPoint("TOPLEFT", button, "TOPLEFT", 5, -5) - text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1) - text:SetJustifyV("MIDDLE") - - local scrollBG = CreateFrame("Frame", nil, frame) - scrollBG:SetBackdrop(backdrop) - scrollBG:SetBackdropColor(0, 0, 0) - scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4) - - local scrollFrame = CreateFrame("ScrollFrame", ("%s%dScrollFrame"):format(Type, widgetNum), frame, "UIPanelScrollFrameTemplate") - - local scrollBar = _G[scrollFrame:GetName() .. "ScrollBar"] - scrollBar:ClearAllPoints() - scrollBar:SetPoint("TOP", label, "BOTTOM", 0, -19) - scrollBar:SetPoint("BOTTOM", button, "TOP", 0, 18) - scrollBar:SetPoint("RIGHT", frame, "RIGHT") - - scrollBG:SetPoint("TOPRIGHT", scrollBar, "TOPLEFT", 0, 19) - scrollBG:SetPoint("BOTTOMLEFT", button, "TOPLEFT") - - scrollFrame:SetPoint("TOPLEFT", scrollBG, "TOPLEFT", 5, -6) - scrollFrame:SetPoint("BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 4) - scrollFrame:SetScript("OnEnter", OnEnter) - scrollFrame:SetScript("OnLeave", OnLeave) - scrollFrame:SetScript("OnMouseUp", OnMouseUp) - scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag) - scrollFrame:SetScript("OnSizeChanged", OnSizeChanged) - scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll) - - local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame) - editBox:SetAllPoints() - editBox:SetFontObject(ChatFontNormal) - editBox:SetMultiLine(true) - editBox:EnableMouse(true) - editBox:SetAutoFocus(false) - editBox:SetCountInvisibleLetters(false) - editBox:SetScript("OnCursorChanged", OnCursorChanged) - editBox:SetScript("OnEditFocusLost", OnEditFocusLost) - editBox:SetScript("OnEnter", OnEnter) - editBox:SetScript("OnEscapePressed", editBox.ClearFocus) - editBox:SetScript("OnLeave", OnLeave) - editBox:SetScript("OnMouseDown", OnReceiveDrag) - editBox:SetScript("OnReceiveDrag", OnReceiveDrag) - editBox:SetScript("OnTextChanged", OnTextChanged) - editBox:SetScript("OnTextSet", OnTextSet) - editBox:SetScript("OnEditFocusGained", OnEditFocusGained) - - - scrollFrame:SetScrollChild(editBox) - - local widget = { - button = button, - editBox = editBox, - frame = frame, - label = label, - labelHeight = 10, - numlines = 4, - scrollBar = scrollBar, - scrollBG = scrollBG, - scrollFrame = scrollFrame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - button.obj, editBox.obj, scrollFrame.obj = widget, widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type, Constructor, Version) diff --git a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua b/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua deleted file mode 100755 index 79e8628..0000000 --- a/Titan/libs/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua +++ /dev/null @@ -1,284 +0,0 @@ ---[[----------------------------------------------------------------------------- -Slider Widget -Graphical Slider, like, for Range values. --------------------------------------------------------------------------------]] -local Type, Version = "Slider", 22 -local AceGUI = LibStub and LibStub("AceGUI-3.0", true) -if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end - --- Lua APIs -local min, max, floor = math.min, math.max, math.floor -local tonumber, pairs = tonumber, pairs - --- WoW APIs -local PlaySound = PlaySound -local CreateFrame, UIParent = CreateFrame, UIParent - --- Global vars/functions that we don't upvalue since they might get hooked, or upgraded --- List them here for Mikk's FindGlobals script --- GLOBALS: GameFontHighlightSmall - ---[[----------------------------------------------------------------------------- -Support functions --------------------------------------------------------------------------------]] -local function UpdateText(self) - local value = self.value or 0 - if self.ispercent then - self.editbox:SetText(("%s%%"):format(floor(value * 1000 + 0.5) / 10)) - else - self.editbox:SetText(floor(value * 100 + 0.5) / 100) - end -end - -local function UpdateLabels(self) - local min, max = (self.min or 0), (self.max or 100) - if self.ispercent then - self.lowtext:SetFormattedText("%s%%", (min * 100)) - self.hightext:SetFormattedText("%s%%", (max * 100)) - else - self.lowtext:SetText(min) - self.hightext:SetText(max) - end -end - ---[[----------------------------------------------------------------------------- -Scripts --------------------------------------------------------------------------------]] -local function Control_OnEnter(frame) - frame.obj:Fire("OnEnter") -end - -local function Control_OnLeave(frame) - frame.obj:Fire("OnLeave") -end - -local function Frame_OnMouseDown(frame) - frame.obj.slider:EnableMouseWheel(true) - AceGUI:ClearFocus() -end - -local function Slider_OnValueChanged(frame, newvalue) - local self = frame.obj - if not frame.setup then - if self.step and self.step > 0 then - local min_value = self.min or 0 - newvalue = floor((newvalue - min_value) / self.step + 0.5) * self.step + min_value - end - if newvalue ~= self.value and not self.disabled then - self.value = newvalue - self:Fire("OnValueChanged", newvalue) - end - if self.value then - UpdateText(self) - end - end -end - -local function Slider_OnMouseUp(frame) - local self = frame.obj - self:Fire("OnMouseUp", self.value) -end - -local function Slider_OnMouseWheel(frame, v) - local self = frame.obj - if not self.disabled then - local value = self.value - if v > 0 then - value = min(value + (self.step or 1), self.max) - else - value = max(value - (self.step or 1), self.min) - end - self.slider:SetValue(value) - end -end - -local function EditBox_OnEscapePressed(frame) - frame:ClearFocus() -end - -local function EditBox_OnEnterPressed(frame) - local self = frame.obj - local value = frame:GetText() - if self.ispercent then - value = value:gsub('%%', '') - value = tonumber(value) / 100 - else - value = tonumber(value) - end - - if value then - PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON - self.slider:SetValue(value) - self:Fire("OnMouseUp", value) - end -end - -local function EditBox_OnEnter(frame) - frame:SetBackdropBorderColor(0.5, 0.5, 0.5, 1) -end - -local function EditBox_OnLeave(frame) - frame:SetBackdropBorderColor(0.3, 0.3, 0.3, 0.8) -end - ---[[----------------------------------------------------------------------------- -Methods --------------------------------------------------------------------------------]] -local methods = { - ["OnAcquire"] = function(self) - self:SetWidth(200) - self:SetHeight(44) - self:SetDisabled(false) - self:SetIsPercent(nil) - self:SetSliderValues(0,100,1) - self:SetValue(0) - self.slider:EnableMouseWheel(false) - end, - - -- ["OnRelease"] = nil, - - ["SetDisabled"] = function(self, disabled) - self.disabled = disabled - if disabled then - self.slider:EnableMouse(false) - self.label:SetTextColor(.5, .5, .5) - self.hightext:SetTextColor(.5, .5, .5) - self.lowtext:SetTextColor(.5, .5, .5) - --self.valuetext:SetTextColor(.5, .5, .5) - self.editbox:SetTextColor(.5, .5, .5) - self.editbox:EnableMouse(false) - self.editbox:ClearFocus() - else - self.slider:EnableMouse(true) - self.label:SetTextColor(1, .82, 0) - self.hightext:SetTextColor(1, 1, 1) - self.lowtext:SetTextColor(1, 1, 1) - --self.valuetext:SetTextColor(1, 1, 1) - self.editbox:SetTextColor(1, 1, 1) - self.editbox:EnableMouse(true) - end - end, - - ["SetValue"] = function(self, value) - self.slider.setup = true - self.slider:SetValue(value) - self.value = value - UpdateText(self) - self.slider.setup = nil - end, - - ["GetValue"] = function(self) - return self.value - end, - - ["SetLabel"] = function(self, text) - self.label:SetText(text) - end, - - ["SetSliderValues"] = function(self, min, max, step) - local frame = self.slider - frame.setup = true - self.min = min - self.max = max - self.step = step - frame:SetMinMaxValues(min or 0,max or 100) - UpdateLabels(self) - frame:SetValueStep(step or 1) - if self.value then - frame:SetValue(self.value) - end - frame.setup = nil - end, - - ["SetIsPercent"] = function(self, value) - self.ispercent = value - UpdateLabels(self) - UpdateText(self) - end -} - ---[[----------------------------------------------------------------------------- -Constructor --------------------------------------------------------------------------------]] -local SliderBackdrop = { - bgFile = "Interface\\Buttons\\UI-SliderBar-Background", - edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", - tile = true, tileSize = 8, edgeSize = 8, - insets = { left = 3, right = 3, top = 6, bottom = 6 } -} - -local ManualBackdrop = { - bgFile = "Interface\\ChatFrame\\ChatFrameBackground", - edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", - tile = true, edgeSize = 1, tileSize = 5, -} - -local function Constructor() - local frame = CreateFrame("Frame", nil, UIParent) - - frame:EnableMouse(true) - frame:SetScript("OnMouseDown", Frame_OnMouseDown) - - local label = frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") - label:SetPoint("TOPLEFT") - label:SetPoint("TOPRIGHT") - label:SetJustifyH("CENTER") - label:SetHeight(15) - - local slider = CreateFrame("Slider", nil, frame) - slider:SetOrientation("HORIZONTAL") - slider:SetHeight(15) - slider:SetHitRectInsets(0, 0, -10, 0) - slider:SetBackdrop(SliderBackdrop) - slider:SetThumbTexture("Interface\\Buttons\\UI-SliderBar-Button-Horizontal") - slider:SetPoint("TOP", label, "BOTTOM") - slider:SetPoint("LEFT", 3, 0) - slider:SetPoint("RIGHT", -3, 0) - slider:SetValue(0) - slider:SetScript("OnValueChanged",Slider_OnValueChanged) - slider:SetScript("OnEnter", Control_OnEnter) - slider:SetScript("OnLeave", Control_OnLeave) - slider:SetScript("OnMouseUp", Slider_OnMouseUp) - slider:SetScript("OnMouseWheel", Slider_OnMouseWheel) - - local lowtext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") - lowtext:SetPoint("TOPLEFT", slider, "BOTTOMLEFT", 2, 3) - - local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") - hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3) - - local editbox = CreateFrame("EditBox", nil, frame) - editbox:SetAutoFocus(false) - editbox:SetFontObject(GameFontHighlightSmall) - editbox:SetPoint("TOP", slider, "BOTTOM") - editbox:SetHeight(14) - editbox:SetWidth(70) - editbox:SetJustifyH("CENTER") - editbox:EnableMouse(true) - editbox:SetBackdrop(ManualBackdrop) - editbox:SetBackdropColor(0, 0, 0, 0.5) - editbox:SetBackdropBorderColor(0.3, 0.3, 0.30, 0.80) - editbox:SetScript("OnEnter", EditBox_OnEnter) - editbox:SetScript("OnLeave", EditBox_OnLeave) - editbox:SetScript("OnEnterPressed", EditBox_OnEnterPressed) - editbox:SetScript("OnEscapePressed", EditBox_OnEscapePressed) - - local widget = { - label = label, - slider = slider, - lowtext = lowtext, - hightext = hightext, - editbox = editbox, - alignoffset = 25, - frame = frame, - type = Type - } - for method, func in pairs(methods) do - widget[method] = func - end - slider.obj, editbox.obj = widget, widget - - return AceGUI:RegisterAsWidget(widget) -end - -AceGUI:RegisterWidgetType(Type,Constructor,Version) diff --git a/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua b/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua deleted file mode 100755 index 5a495f6..0000000 --- a/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua +++ /dev/null @@ -1,239 +0,0 @@ ---[[ $Id: CallbackHandler-1.0.lua 3 2008-09-29 16:54:20Z nevcairiel $ ]] -local MAJOR, MINOR = "CallbackHandler-1.0", 3 -local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR) - -if not CallbackHandler then return end -- No upgrade needed - -local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end} - -local type = type -local pcall = pcall -local pairs = pairs -local assert = assert -local concat = table.concat -local loadstring = loadstring -local next = next -local select = select -local type = type -local xpcall = xpcall - -local function errorhandler(err) - return geterrorhandler()(err) -end - -local function CreateDispatcher(argCount) - local code = [[ - local next, xpcall, eh = ... - - local method, ARGS - local function call() method(ARGS) end - - local function dispatch(handlers, ...) - local index - index, method = next(handlers) - if not method then return end - local OLD_ARGS = ARGS - ARGS = ... - repeat - xpcall(call, eh) - index, method = next(handlers, index) - until not method - ARGS = OLD_ARGS - end - - return dispatch - ]] - - local ARGS, OLD_ARGS = {}, {} - for i = 1, argCount do ARGS[i], OLD_ARGS[i] = "arg"..i, "old_arg"..i end - code = code:gsub("OLD_ARGS", concat(OLD_ARGS, ", ")):gsub("ARGS", concat(ARGS, ", ")) - return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(next, xpcall, errorhandler) -end - -local Dispatchers = setmetatable({}, {__index=function(self, argCount) - local dispatcher = CreateDispatcher(argCount) - rawset(self, argCount, dispatcher) - return dispatcher -end}) - --------------------------------------------------------------------------- --- CallbackHandler:New --- --- target - target object to embed public APIs in --- RegisterName - name of the callback registration API, default "RegisterCallback" --- UnregisterName - name of the callback unregistration API, default "UnregisterCallback" --- UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API. - -function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName, OnUsed, OnUnused) - -- TODO: Remove this after beta has gone out - assert(not OnUsed and not OnUnused, "ACE-80: OnUsed/OnUnused are deprecated. Callbacks are now done to registry.OnUsed and registry.OnUnused") - - RegisterName = RegisterName or "RegisterCallback" - UnregisterName = UnregisterName or "UnregisterCallback" - if UnregisterAllName==nil then -- false is used to indicate "don't want this method" - UnregisterAllName = "UnregisterAllCallbacks" - end - - -- we declare all objects and exported APIs inside this closure to quickly gain access - -- to e.g. function names, the "target" parameter, etc - - - -- Create the registry object - local events = setmetatable({}, meta) - local registry = { recurse=0, events=events } - - -- registry:Fire() - fires the given event/message into the registry - function registry:Fire(eventname, ...) - if not rawget(events, eventname) or not next(events[eventname]) then return end - local oldrecurse = registry.recurse - registry.recurse = oldrecurse + 1 - - Dispatchers[select('#', ...) + 1](events[eventname], eventname, ...) - - registry.recurse = oldrecurse - - if registry.insertQueue and oldrecurse==0 then - -- Something in one of our callbacks wanted to register more callbacks; they got queued - for eventname,callbacks in pairs(registry.insertQueue) do - local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. - for self,func in pairs(callbacks) do - events[eventname][self] = func - -- fire OnUsed callback? - if first and registry.OnUsed then - registry.OnUsed(registry, target, eventname) - first = nil - end - end - end - registry.insertQueue = nil - end - end - - -- Registration of a callback, handles: - -- self["method"], leads to self["method"](self, ...) - -- self with function ref, leads to functionref(...) - -- "addonId" (instead of self) with function ref, leads to functionref(...) - -- all with an optional arg, which, if present, gets passed as first argument (after self if present) - target[RegisterName] = function(self, eventname, method, ... --[[actually just a single arg]]) - if type(eventname) ~= "string" then - error("Usage: "..RegisterName.."(eventname, method[, arg]): 'eventname' - string expected.", 2) - end - - method = method or eventname - - local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten. - - if type(method) ~= "string" and type(method) ~= "function" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - string or function expected.", 2) - end - - local regfunc - - if type(method) == "string" then - -- self["method"] calling style - if type(self) ~= "table" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): self was not a table?", 2) - elseif self==target then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): do not use Library:"..RegisterName.."(), use your own 'self'", 2) - elseif type(self[method]) ~= "function" then - error("Usage: "..RegisterName.."(\"eventname\", \"methodname\"): 'methodname' - method '"..tostring(method).."' not found on self.", 2) - end - - if select("#",...)>=1 then -- this is not the same as testing for arg==nil! - local arg=select(1,...) - regfunc = function(...) self[method](self,arg,...) end - else - regfunc = function(...) self[method](self,...) end - end - else - -- function ref with self=object or self="addonId" - if type(self)~="table" and type(self)~="string" then - error("Usage: "..RegisterName.."(self or \"addonId\", eventname, method): 'self or addonId': table or string expected.", 2) - end - - if select("#",...)>=1 then -- this is not the same as testing for arg==nil! - local arg=select(1,...) - regfunc = function(...) method(arg,...) end - else - regfunc = method - end - end - - - if events[eventname][self] or registry.recurse<1 then - -- if registry.recurse<1 then - -- we're overwriting an existing entry, or not currently recursing. just set it. - events[eventname][self] = regfunc - -- fire OnUsed callback? - if registry.OnUsed and first then - registry.OnUsed(registry, target, eventname) - end - else - -- we're currently processing a callback in this registry, so delay the registration of this new entry! - -- yes, we're a bit wasteful on garbage, but this is a fringe case, so we're picking low implementation overhead over garbage efficiency - registry.insertQueue = registry.insertQueue or setmetatable({},meta) - registry.insertQueue[eventname][self] = regfunc - end - end - - -- Unregister a callback - target[UnregisterName] = function(self, eventname) - if not self or self==target then - error("Usage: "..UnregisterName.."(eventname): bad 'self'", 2) - end - if type(eventname) ~= "string" then - error("Usage: "..UnregisterName.."(eventname): 'eventname' - string expected.", 2) - end - if rawget(events, eventname) and events[eventname][self] then - events[eventname][self] = nil - -- Fire OnUnused callback? - if registry.OnUnused and not next(events[eventname]) then - registry.OnUnused(registry, target, eventname) - end - end - if registry.insertQueue and rawget(registry.insertQueue, eventname) and registry.insertQueue[eventname][self] then - registry.insertQueue[eventname][self] = nil - end - end - - -- OPTIONAL: Unregister all callbacks for given selfs/addonIds - if UnregisterAllName then - target[UnregisterAllName] = function(...) - if select("#",...)<1 then - error("Usage: "..UnregisterAllName.."([whatFor]): missing 'self' or \"addonId\" to unregister events for.", 2) - end - if select("#",...)==1 and ...==target then - error("Usage: "..UnregisterAllName.."([whatFor]): supply a meaningful 'self' or \"addonId\"", 2) - end - - - for i=1,select("#",...) do - local self = select(i,...) - if registry.insertQueue then - for eventname, callbacks in pairs(registry.insertQueue) do - if callbacks[self] then - callbacks[self] = nil - end - end - end - for eventname, callbacks in pairs(events) do - if callbacks[self] then - callbacks[self] = nil - -- Fire OnUnused callback? - if registry.OnUnused and not next(callbacks) then - registry.OnUnused(registry, target, eventname) - end - end - end - end - end - end - - return registry -end - - --- CallbackHandler purposefully does NOT do explicit embedding. Nor does it --- try to upgrade old implicit embeds since the system is selfcontained and --- relies on closures to work. - diff --git a/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml b/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml deleted file mode 100755 index 1aad3a2..0000000 --- a/Titan/libs/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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"> - <Script file="CallbackHandler-1.0.lua"/> -</Ui> \ No newline at end of file diff --git a/Titan/libs/Libs/LibSharedMedia-3.0/LibSharedMedia-3.0.lua b/Titan/libs/Libs/LibSharedMedia-3.0/LibSharedMedia-3.0.lua deleted file mode 100755 index 1e1e25f..0000000 --- a/Titan/libs/Libs/LibSharedMedia-3.0/LibSharedMedia-3.0.lua +++ /dev/null @@ -1,290 +0,0 @@ ---[[ -Name: LibSharedMedia-3.0 -Revision: $Revision: 106 $ -Author: Elkano (elkano@gmx.de) -Inspired By: SurfaceLib by Haste/Otravi (troeks@gmail.com) -Website: http://www.wowace.com/projects/libsharedmedia-3-0/ -Description: Shared handling of media data (fonts, sounds, textures, ...) between addons. -Dependencies: LibStub, CallbackHandler-1.0 -License: LGPL v2.1 -]] - -local MAJOR, MINOR = "LibSharedMedia-3.0", 6010002 -- 6.1.0 v2 / increase manually on changes -local lib = LibStub:NewLibrary(MAJOR, MINOR) - -if not lib then return end - -local _G = getfenv(0) - -local pairs = _G.pairs -local type = _G.type - -local band = _G.bit.band -local table_sort = _G.table.sort - -local locale = GetLocale() -local locale_is_western -local LOCALE_MASK = 0 -lib.LOCALE_BIT_koKR = 1 -lib.LOCALE_BIT_ruRU = 2 -lib.LOCALE_BIT_zhCN = 4 -lib.LOCALE_BIT_zhTW = 8 -lib.LOCALE_BIT_western = 128 - -local CallbackHandler = LibStub:GetLibrary("CallbackHandler-1.0") - -lib.callbacks = lib.callbacks or CallbackHandler:New(lib) - -lib.DefaultMedia = lib.DefaultMedia or {} -lib.MediaList = lib.MediaList or {} -lib.MediaTable = lib.MediaTable or {} -lib.MediaType = lib.MediaType or {} -lib.OverrideMedia = lib.OverrideMedia or {} - -local defaultMedia = lib.DefaultMedia -local mediaList = lib.MediaList -local mediaTable = lib.MediaTable -local overrideMedia = lib.OverrideMedia - - --- create mediatype constants -lib.MediaType.BACKGROUND = "background" -- background textures -lib.MediaType.BORDER = "border" -- border textures -lib.MediaType.FONT = "font" -- fonts -lib.MediaType.STATUSBAR = "statusbar" -- statusbar textures -lib.MediaType.SOUND = "sound" -- sound files - --- populate lib with default Blizzard data --- BACKGROUND -if not lib.MediaTable.background then lib.MediaTable.background = {} end -lib.MediaTable.background["None"] = [[]] -lib.MediaTable.background["Blizzard Collections Background"] = [[Interface\Collections\CollectionsBackgroundTile]] -lib.MediaTable.background["Blizzard Dialog Background"] = [[Interface\DialogFrame\UI-DialogBox-Background]] -lib.MediaTable.background["Blizzard Dialog Background Dark"] = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]] -lib.MediaTable.background["Blizzard Dialog Background Gold"] = [[Interface\DialogFrame\UI-DialogBox-Gold-Background]] -lib.MediaTable.background["Blizzard Garrison Background"] = [[Interface\Garrison\GarrisonUIBackground]] -lib.MediaTable.background["Blizzard Garrison Background 2"] = [[Interface\Garrison\GarrisonUIBackground2]] -lib.MediaTable.background["Blizzard Garrison Background 3"] = [[Interface\Garrison\GarrisonMissionUIInfoBoxBackgroundTile]] -lib.MediaTable.background["Blizzard Low Health"] = [[Interface\FullScreenTextures\LowHealth]] -lib.MediaTable.background["Blizzard Marble"] = [[Interface\FrameGeneral\UI-Background-Marble]] -lib.MediaTable.background["Blizzard Out of Control"] = [[Interface\FullScreenTextures\OutOfControl]] -lib.MediaTable.background["Blizzard Parchment"] = [[Interface\AchievementFrame\UI-Achievement-Parchment-Horizontal]] -lib.MediaTable.background["Blizzard Parchment 2"] = [[Interface\AchievementFrame\UI-GuildAchievement-Parchment-Horizontal]] -lib.MediaTable.background["Blizzard Rock"] = [[Interface\FrameGeneral\UI-Background-Rock]] -lib.MediaTable.background["Blizzard Tabard Background"] = [[Interface\TabardFrame\TabardFrameBackground]] -lib.MediaTable.background["Blizzard Tooltip"] = [[Interface\Tooltips\UI-Tooltip-Background]] -lib.MediaTable.background["Solid"] = [[Interface\Buttons\WHITE8X8]] -lib.DefaultMedia.background = "None" - --- BORDER -if not lib.MediaTable.border then lib.MediaTable.border = {} end -lib.MediaTable.border["None"] = [[]] -lib.MediaTable.border["Blizzard Achievement Wood"] = [[Interface\AchievementFrame\UI-Achievement-WoodBorder]] -lib.MediaTable.border["Blizzard Chat Bubble"] = [[Interface\Tooltips\ChatBubble-Backdrop]] -lib.MediaTable.border["Blizzard Dialog"] = [[Interface\DialogFrame\UI-DialogBox-Border]] -lib.MediaTable.border["Blizzard Dialog Gold"] = [[Interface\DialogFrame\UI-DialogBox-Gold-Border]] -lib.MediaTable.border["Blizzard Party"] = [[Interface\CHARACTERFRAME\UI-Party-Border]] -lib.MediaTable.border["Blizzard Tooltip"] = [[Interface\Tooltips\UI-Tooltip-Border]] -lib.DefaultMedia.border = "None" - --- FONT -if not lib.MediaTable.font then lib.MediaTable.font = {} end -local SML_MT_font = lib.MediaTable.font ---[[ -All font files are currently in all clients, the following table depicts which font supports which charset as of 5.0.4 -Fonts were checked using langcover.pl from DejaVu fonts (http://sourceforge.net/projects/dejavu/) and FontForge (http://fontforge.org/) -latin means check for: de, en, es, fr, it, pt - -file name latin koKR ruRU zhCN zhTW -2002.ttf 2002 X X X - - -2002B.ttf 2002 Bold X X X - - -ARHei.ttf AR CrystalzcuheiGBK Demibold X - X X X -ARIALN.TTF Arial Narrow X - X - - -ARKai_C.ttf AR ZhongkaiGBK Medium (Combat) X - X X X -ARKai_T.ttf AR ZhongkaiGBK Medium X - X X X -bHEI00M.ttf AR Heiti2 Medium B5 - - - - X -bHEI01B.ttf AR Heiti2 Bold B5 - - - - X -bKAI00M.ttf AR Kaiti Medium B5 - - - - X -bLEI00D.ttf AR Leisu Demi B5 - - - - X -FRIZQT__.TTF Friz Quadrata TT X - - - - -FRIZQT___CYR.TTF FrizQuadrataCTT x - X - - -K_Damage.TTF YDIWingsM - X X - - -K_Pagetext.TTF MoK X X X - - -MORPHEUS.TTF Morpheus X - - - - -MORPHEUS_CYR.TTF Morpheus X - X - - -NIM_____.ttf Nimrod MT X - X - - -SKURRI.TTF Skurri X - - - - -SKURRI_CYR.TTF Skurri X - X - - - -WARNING: Although FRIZQT___CYR is available on western clients, it doesn't support special European characters e.g. é, ï, ö -Due to this, we cannot use it as a replacement for FRIZQT__.TTF -]] - -if locale == "koKR" then - LOCALE_MASK = lib.LOCALE_BIT_koKR --- - SML_MT_font["굵은 글꼴"] = [[Fonts\2002B.TTF]] - SML_MT_font["기본 글꼴"] = [[Fonts\2002.TTF]] - SML_MT_font["데미지 글꼴"] = [[Fonts\K_Damage.TTF]] - SML_MT_font["퀘스트 글꼴"] = [[Fonts\K_Pagetext.TTF]] --- - lib.DefaultMedia["font"] = "기본 글꼴" -- someone from koKR please adjust if needed --- -elseif locale == "zhCN" then - LOCALE_MASK = lib.LOCALE_BIT_zhCN --- - SML_MT_font["伤害数字"] = [[Fonts\ARKai_C.ttf]] - SML_MT_font["默认"] = [[Fonts\ARKai_T.ttf]] - SML_MT_font["聊天"] = [[Fonts\ARHei.ttf]] --- - lib.DefaultMedia["font"] = "默认" -- someone from zhCN please adjust if needed --- -elseif locale == "zhTW" then - LOCALE_MASK = lib.LOCALE_BIT_zhTW --- - SML_MT_font["提示訊息"] = [[Fonts\bHEI00M.ttf]] - SML_MT_font["聊天"] = [[Fonts\bHEI01B.ttf]] - SML_MT_font["傷害數字"] = [[Fonts\bKAI00M.ttf]] - SML_MT_font["預設"] = [[Fonts\bLEI00D.ttf]] --- - lib.DefaultMedia["font"] = "預設" -- someone from zhTW please adjust if needed - -elseif locale == "ruRU" then - LOCALE_MASK = lib.LOCALE_BIT_ruRU --- - SML_MT_font["2002"] = [[Fonts\2002.TTF]] - SML_MT_font["2002 Bold"] = [[Fonts\2002B.TTF]] - SML_MT_font["AR CrystalzcuheiGBK Demibold"] = [[Fonts\ARHei.TTF]] - SML_MT_font["AR ZhongkaiGBK Medium (Combat)"] = [[Fonts\ARKai_C.TTF]] - SML_MT_font["AR ZhongkaiGBK Medium"] = [[Fonts\ARKai_T.TTF]] - SML_MT_font["Arial Narrow"] = [[Fonts\ARIALN.TTF]] - SML_MT_font["Friz Quadrata TT"] = [[Fonts\FRIZQT___CYR.TTF]] - SML_MT_font["MoK"] = [[Fonts\K_Pagetext.TTF]] - SML_MT_font["Morpheus"] = [[Fonts\MORPHEUS_CYR.TTF]] - SML_MT_font["Nimrod MT"] = [[Fonts\NIM_____.ttf]] - SML_MT_font["Skurri"] = [[Fonts\SKURRI_CYR.TTF]] --- - lib.DefaultMedia.font = "Friz Quadrata TT" --- -else - LOCALE_MASK = lib.LOCALE_BIT_western - locale_is_western = true --- - SML_MT_font["2002"] = [[Fonts\2002.TTF]] - SML_MT_font["2002 Bold"] = [[Fonts\2002B.TTF]] - SML_MT_font["AR CrystalzcuheiGBK Demibold"] = [[Fonts\ARHei.TTF]] - SML_MT_font["AR ZhongkaiGBK Medium (Combat)"] = [[Fonts\ARKai_C.TTF]] - SML_MT_font["AR ZhongkaiGBK Medium"] = [[Fonts\ARKai_T.TTF]] - SML_MT_font["Arial Narrow"] = [[Fonts\ARIALN.TTF]] - SML_MT_font["Friz Quadrata TT"] = [[Fonts\FRIZQT__.TTF]] - SML_MT_font["MoK"] = [[Fonts\K_Pagetext.TTF]] - SML_MT_font["Morpheus"] = [[Fonts\MORPHEUS_CYR.TTF]] - SML_MT_font["Nimrod MT"] = [[Fonts\NIM_____.ttf]] - SML_MT_font["Skurri"] = [[Fonts\SKURRI_CYR.TTF]] --- - lib.DefaultMedia.font = "Friz Quadrata TT" --- -end - --- STATUSBAR -if not lib.MediaTable.statusbar then lib.MediaTable.statusbar = {} end -lib.MediaTable.statusbar["Blizzard"] = [[Interface\TargetingFrame\UI-StatusBar]] -lib.MediaTable.statusbar["Blizzard Character Skills Bar"] = [[Interface\PaperDollInfoFrame\UI-Character-Skills-Bar]] -lib.MediaTable.statusbar["Blizzard Raid Bar"] = [[Interface\RaidFrame\Raid-Bar-Hp-Fill]] -lib.DefaultMedia.statusbar = "Blizzard" - --- SOUND -if not lib.MediaTable.sound then lib.MediaTable.sound = {} end -lib.MediaTable.sound["None"] = [[Interface\Quiet.ogg]] -- Relies on the fact that PlaySound[File] doesn't error on non-existing input. -lib.DefaultMedia.sound = "None" - -local function rebuildMediaList(mediatype) - local mtable = mediaTable[mediatype] - if not mtable then return end - if not mediaList[mediatype] then mediaList[mediatype] = {} end - local mlist = mediaList[mediatype] - -- list can only get larger, so simply overwrite it - local i = 0 - for k in pairs(mtable) do - i = i + 1 - mlist[i] = k - end - table_sort(mlist) -end - -function lib:Register(mediatype, key, data, langmask) - if type(mediatype) ~= "string" then - error(MAJOR..":Register(mediatype, key, data, langmask) - mediatype must be string, got "..type(mediatype)) - end - if type(key) ~= "string" then - error(MAJOR..":Register(mediatype, key, data, langmask) - key must be string, got "..type(key)) - end - mediatype = mediatype:lower() - if mediatype == lib.MediaType.FONT and ((langmask and band(langmask, LOCALE_MASK) == 0) or not (langmask or locale_is_western)) then return false end - if mediatype == lib.MediaType.SOUND and type(data) == "string" then - local path = data:lower() - -- Only ogg and mp3 are valid sounds. - if not path:find(".ogg", nil, true) and not path:find(".mp3", nil, true) then - return false - end - end - if not mediaTable[mediatype] then mediaTable[mediatype] = {} end - local mtable = mediaTable[mediatype] - if mtable[key] then return false end - - mtable[key] = data - rebuildMediaList(mediatype) - self.callbacks:Fire("LibSharedMedia_Registered", mediatype, key) - return true -end - -function lib:Fetch(mediatype, key, noDefault) - local mtt = mediaTable[mediatype] - local overridekey = overrideMedia[mediatype] - local result = mtt and ((overridekey and mtt[overridekey] or mtt[key]) or (not noDefault and defaultMedia[mediatype] and mtt[defaultMedia[mediatype]])) or nil - return result ~= "" and result or nil -end - -function lib:IsValid(mediatype, key) - return mediaTable[mediatype] and (not key or mediaTable[mediatype][key]) and true or false -end - -function lib:HashTable(mediatype) - return mediaTable[mediatype] -end - -function lib:List(mediatype) - if not mediaTable[mediatype] then - return nil - end - if not mediaList[mediatype] then - rebuildMediaList(mediatype) - end - return mediaList[mediatype] -end - -function lib:GetGlobal(mediatype) - return overrideMedia[mediatype] -end - -function lib:SetGlobal(mediatype, key) - if not mediaTable[mediatype] then - return false - end - overrideMedia[mediatype] = (key and mediaTable[mediatype][key]) and key or nil - self.callbacks:Fire("LibSharedMedia_SetGlobal", mediatype, overrideMedia[mediatype]) - return true -end - -function lib:GetDefault(mediatype) - return defaultMedia[mediatype] -end - -function lib:SetDefault(mediatype, key) - if mediaTable[mediatype] and mediaTable[mediatype][key] and not defaultMedia[mediatype] then - defaultMedia[mediatype] = key - return true - else - return false - end -end diff --git a/Titan/libs/Libs/LibSharedMedia-3.0/lib.xml b/Titan/libs/Libs/LibSharedMedia-3.0/lib.xml deleted file mode 100755 index 5b4a5c8..0000000 --- a/Titan/libs/Libs/LibSharedMedia-3.0/lib.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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"> - <Script file="LibSharedMedia-3.0.lua" /> -</Ui> \ No newline at end of file diff --git a/Titan/libs/Libs/LibStub/LibStub.lua b/Titan/libs/Libs/LibStub/LibStub.lua deleted file mode 100755 index cfc97de..0000000 --- a/Titan/libs/Libs/LibStub/LibStub.lua +++ /dev/null @@ -1,30 +0,0 @@ --- LibStub is a simple versioning stub meant for use in Libraries. http://www.wowace.com/wiki/LibStub for more info --- LibStub is hereby placed in the Public Domain Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel, joshborke -local LIBSTUB_MAJOR, LIBSTUB_MINOR = "LibStub", 2 -- NEVER MAKE THIS AN SVN REVISION! IT NEEDS TO BE USABLE IN ALL REPOS! -local LibStub = _G[LIBSTUB_MAJOR] - -if not LibStub or LibStub.minor < LIBSTUB_MINOR then - LibStub = LibStub or {libs = {}, minors = {} } - _G[LIBSTUB_MAJOR] = LibStub - LibStub.minor = LIBSTUB_MINOR - - function LibStub:NewLibrary(major, minor) - assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)") - minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.") - - local oldminor = self.minors[major] - if oldminor and oldminor >= minor then return nil end - self.minors[major], self.libs[major] = minor, self.libs[major] or {} - return self.libs[major], oldminor - end - - function LibStub:GetLibrary(major, silent) - if not self.libs[major] and not silent then - error(("Cannot find a library instance of %q."):format(tostring(major)), 2) - end - return self.libs[major], self.minors[major] - end - - function LibStub:IterateLibraries() return pairs(self.libs) end - setmetatable(LibStub, { __call = LibStub.GetLibrary }) -end diff --git a/Titan/libs/Libs/LibStub/LibStub.toc b/Titan/libs/Libs/LibStub/LibStub.toc deleted file mode 100755 index fb3de08..0000000 --- a/Titan/libs/Libs/LibStub/LibStub.toc +++ /dev/null @@ -1,9 +0,0 @@ -## Interface: 20400 -## Title: Lib: LibStub -## Notes: Universal Library Stub -## Credits: Kaelten, Cladhaire, ckknight, Mikk, Ammo, Nevcairiel -## X-Website: http://jira.wowace.com/browse/LS -## X-Category: Library -## X-License: Public Domain - -LibStub.lua diff --git a/Titan/libs/changelog.txt b/Titan/libs/changelog.txt index 9e28255..04a92ec 100755 --- a/Titan/libs/changelog.txt +++ b/Titan/libs/changelog.txt @@ -1,3 +1,13 @@ +Ace3 Release - Revision r1227 (August 12th, 2019) +------------------------------------------------- +- AceConfigDialog-3.0: Fixed an issue with a missing template on WoW Classic (Ticket #517) + +Ace3 Release - Revision r1224 (August 1st, 2019) +------------------------------------------------ +- AceConfigDialog-3.0: Replace use of StaticPopup with a custom frame to minimize taint +- AceGUI-3.0: Ensure the OnLeave callback on various widgets still fires when its being released while visible (Ticket #505) +- AceGUI-3.0: Various fixes for anchoring problems in WoW 8.2 (Ticket #512, and other reports) + Ace3 Release - Revision r1214 (June 26th, 2019) ----------------------------------------------- - AceConfigDialog-3.0: Exposed "select" type sorting control through a new "sorting" config table member diff --git a/Titan/libs/lib.xml b/Titan/libs/lib.xml deleted file mode 100755 index fd1c0cd..0000000 --- a/Titan/libs/lib.xml +++ /dev/null @@ -1,5 +0,0 @@ -<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"> - <Include file="LibSharedMedia-3.0\lib.xml"/> -</Ui> - diff --git a/Titan/libs/widget.xml b/Titan/libs/widget.xml deleted file mode 100755 index ca8847a..0000000 --- a/Titan/libs/widget.xml +++ /dev/null @@ -1,4 +0,0 @@ -<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"> - <Include file="AceGUI-3.0-SharedMediaWidgets\widget.xml" /> -</Ui> diff --git a/TitanBag/TitanBag.lua b/TitanBag/TitanBag.lua index bf6b739..d039c4b 100644 --- a/TitanBag/TitanBag.lua +++ b/TitanBag/TitanBag.lua @@ -16,6 +16,78 @@ local updateTable = {TITAN_BAG_ID, TITAN_PANEL_UPDATE_BUTTON}; local L = LibStub("AceLocale-3.0"):GetLocale("Titan", true) local AceTimer = LibStub("AceTimer-3.0") local BagTimer + +local bag_info = { + ENCHANTING = { color = {r=0,g=0,b=1}}, -- BLUE + ENGINEERING = { color = {r=1,g=0.49,b=0.04}}, -- ORANGE + HERBALISM = { color = {r=0,g=1,b=0}}, -- GREEN + INSCRIPTION = { color = {r=0.58,g=0.51,b=0.79}}, -- PURPLE + JEWELCRAFTING = { color = {r=1,g=0,b=0}}, -- RED + LEATHERWORKING = { color = {r=0.78,g=0.61,b=0.43}}, -- TAN + MINING = { color = {r=1,g=1,b=1}}, -- WHITE + FISHING = { color = {r=0.41,g=0.8,b=0.94}}, -- LIGHT_BLUE + COOKING = { color = {r=0.96,g=0.55,b=0.73}}, -- PINK +} +-- "Khorium Toolbox" removed??? + -- names are for debug only +local bags = { + [333] = {style = "", name = ""}, + [21858] = {style = "ENCHANTING", name = "Spellfire Bag"}, + [22246] = {style = "ENCHANTING", name = "Enchanted Mageweave Pouch"}, + [22248] = {style = "ENCHANTING", name = "Enchanted Runecloth Bag"}, + [22249] = {style = "ENCHANTING", name = "Big Bag of Enchantment"}, + [22250] = {style = "HERBALISM", name = "Herb Pouch"}, + [22251] = {style = "HERBALISM", name = "Cenarion Herb Bag"}, + [22252] = {style = "HERBALISM", name = "Satchel of Cenarius"}, + [23774] = {style = "ENGINEERING", name = "Fel Iron Toolbox"}, + [23775] = {style = "ENGINEERING", name = "Titanium Toolbox"}, + [24270] = {style = "JEWELCRAFTING", name = "Bag of Jewels"}, + [29540] = {style = "MINING", name = "Reinforced Mining Bag"}, + [30745] = {style = "ENGINEERING", name = "Heavy Toolbox"}, -- * + [30746] = {style = "MINING", name = "Mining Sack"}, + [30747] = {style = "JEWELCRAFTING", name = "Gem Pouch"}, + [30748] = {style = "ENCHANTING", name = "Enchanter's Satchel"}, + [34482] = {style = "LEATHERWORKING", name = "Leatherworker's Satchel"}, + [34490] = {style = "LEATHERWORKING", name = "Bag of Many Hides"}, + [38225] = {style = "HERBALISM", name = "Mycah's Botanical Bag"}, + [38307] = {style = "INSCRIPTION", name = "Crafty's Bottomless Inscription Bag"}, -- * + [38347] = {style = "MINING", name = "Mammoth Mining Bag"}, + [38399] = {style = "LEATHERWORKING", name = "Trapper's Traveling Pack"}, + [39489] = {style = "INSCRIPTION", name = "Scribe's Satchel"}, + [41598] = {style = "ENCHANTING", name = "Mysterious Bag"}, + [44446] = {style = "INSCRIPTION", name = "Pack of Endless Pockets"}, + [45773] = {style = "HERBALISM", name = "Emerald Bag"}, + [54445] = {style = "ENCHANTING", name = "Otherworldly Bag"}, + [54446] = {style = "HERBALISM", name = "Hyjal Expedition Bag"}, + [60217] = {style = "ENGINEERING", name = "Elementium Toolbox"}, + [60218] = {style = "FISHING", name = "Lure Master Tackle Box"}, + [67389] = {style = "ENCHANTING", name = "\"Carriage - Exclusive\" Enchanting Evening Purse"}, + [67390] = {style = "ENGINEERING", name = "\"Carriage - Maddy\" High Tech Bag"}, + [67392] = {style = "JEWELCRAFTING", name = "\"Carriage - Exclusive\" Gem Studded Clutch"}, + [67393] = {style = "HERBALISM", name = "\"Carriage - Going Green\" Herb Tote Bag"}, + [67394] = {style = "INSCRIPTION", name = "\"Carriage - Xandera\" Student's Satchel"}, + [67395] = {style = "LEATHERWORKING", name = "\"Carriage - Meeya\" Leather Bag"}, + [67396] = {style = "MINING", name = "\"Carriage - Christina\" Precious Metal Bag"}, + [70136] = {style = "INSCRIPTION", name = "Royal Scribe's Satchel"}, -- * + [70137] = {style = "MINING", name = "Triple-Reinforced Mining Bag"},-- * + [92746] = {style = "COOKING", name = "Portable Refrigerator"}, -- repeat, which one is real? + [92747] = {style = "COOKING", name = "Advanced Refrigeration Unit"}, + [92748] = {style = "COOKING", name = "Portable Refrigerator"}, -- repeat, which one is real? + [70138] = {style = "JEWELCRAFTING", name = "Luxurious Silk Gem Bag"}, -- * + [95536] = {style = "LEATHERWORKING", name = "Magnificent Hide Pack"}, -- * + [116259] = {style = "LEATHERWORKING", name = "Burnished Leather Bag"}, + [116260] = {style = "MINING", name = "Burnished Mining Bag"}, + [116261] = {style = "MINING", name = "Burnished Inscription Bag"}, + [116404] = {style = "ENGINEERING", name = "Pilgrim's Bounty"}, -- * + [130943] = {style = "COOKING", name = "Reusable Tote Bag"}, -- * + [162588] = {style = "INSCRIPTION", name = "Weathered Scrollcase"}, +--[[ +print("--") +print(ZZbags[21858].style) +--]] +} +ZZbags = bags + -- ******************************** Functions ******************************* -- ************************************************************************** @@ -87,11 +159,140 @@ function TitanPanelBagButton_OnClick(self, button) end -- ************************************************************************** --- NAME : TitanPanelBagButton_GetButtonText(id) --- DESC : Calculate bag space logic then display data on button --- VARS : id = button ID +-- NAME : isProfBag(id) +-- DESC : Determine if this is a profession bag by getting its id and checking +-- against the table of known ids. +-- If it is a profession bag then grab its 'color' in case the user requested it. +-- VARS : name = text (localized) of the bag to check -- ************************************************************************** -function TitanPanelBagButton_GetButtonText(id) +--[==[ + local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, + itemStackCount, itemEquipLoc, itemIcon, itemSellPrice, itemClassID, itemSubClassID, + bindType, expacID, itemSetID, isCraftingReagent = + GetItemInfo(bag_name) + local bag_type = false + local color = {r=0,g=0,b=0} -- black (should never be used...) + + if itemName == nil or itemName == false then + -- For some inexplicable reason the Backpack does not return as an item... + --TitanDebug("Bag name not found: '"..tostring(name).."'") + else + local _, _, icolor, ltype, id, enchant, gem1, gem2, gem3, gem4, + suffix, unique, linkLvl, specID, + upgradeID, instance_diff_id, num_bonus_ids, bonus1, bonus2, name = string.find(itemLink, + "|?c?f?f?(%x*)|?H?([^:]*):?(%d+):?(%d*):?(%d*):?(%d*):?(%d*):?(%d*):?(%-?%d*):?(%-?%d*):?(%d*):?(%d*):?(%-?%d*):?(%d*):?(%d*):?(%d*):?(%d*):|h%[(.-)%]|h?|?r?") + + local string_id = tonumber(id) + if bags[string_id] then + bag_type = bags[string_id].style + color = bag_info[bag_type].color + else + -- not a profession bag + end +--[[ +TitanDebug("Bag id: "..tostring(string_id).." '"..tostring(bag_type).."'" +.." ["..tostring(icolor).."]:" +.." '"..tostring(string.format("%1.2f",color.r)).."' '"..tostring(string.format("%1.2f",color.g)).."' '"..tostring(string.format("%1.2f",color.b)).."'") +--]] + end +--]==] +local function isProfBag(bag_name) + -- using straight GetItemInfo caused a 'script ran too long' error on Shadowlands ptr although it worked in retail + -- GetItemInfoInstant returns the needed id and uses client files - no server call. + local itemID, itemType, itemSubType, itemEquipLoc, icon, itemClassID, itemSubClassID = GetItemInfoInstant(bag_name) + local bag_type = false + local color = {r=0,g=0,b=0} -- black (should never be used...) + + if itemID == nil or itemId == false then + -- For some inexplicable reason the Backpack does not return as an item... + --TitanDebug("Bag name not found: '"..tostring(name).."'") + else + if bags[itemID] then + bag_type = bags[itemID].style + color = bag_info[bag_type].color + else + -- not a profession bag + end + end + +--[[ +TitanDebug("isProfBag: "..tostring(itemID).." '"..tostring(bag_type) +.." '"..tostring(string.format("%1.2f",color.r)).."' '"..tostring(string.format("%1.2f",color.g)).."' '"..tostring(string.format("%1.2f",color.b)).."'") +--]] + return bag_type, color +end + +local function TextTest(id) + local button, id = TitanUtils_GetButton(id, true); + local totalBagSlots, usedBagSlots, availableBagSlots, bag, bagText, bagRichText, bagType, color; + local totalProfBagSlots = {0,0,0,0,0}; + local usedProfBagSlots = {0,0,0,0,0}; + local availableProfBagSlots = {0,0,0,0,0}; + local bagRichTextProf = {"","","","",""}; + + totalBagSlots = 0; + usedBagSlots = 0; + for bag = 0, 4 do -- assuming 0 (Backpack) will not be a profession bag + bagType, color = isProfBag(GetBagName(bag)) + + if bagType then -- found a profession bag + -- when user wants profession bags counted, they are listed separately in the plugin + if TitanGetVar(TITAN_BAG_ID, "CountProfBagSlots") then + local size = GetContainerNumSlots(bag); + if (size and size > 0) then + totalProfBagSlots[bag] = size; + for slot = 1, size do + if (GetContainerItemInfo(bag, slot)) then + usedProfBagSlots[bag] = usedProfBagSlots[bag] + 1; + end + end + availableProfBagSlots[bag] = totalProfBagSlots[bag] - usedProfBagSlots[bag]; + end + + if (TitanGetVar(TITAN_BAG_ID, "ShowUsedSlots")) then + bagText = " [" .. format(L["TITAN_BAG_FORMAT"], usedProfBagSlots[bag], totalProfBagSlots[bag]) .. "]"; + else + bagText = " [" .. format(L["TITAN_BAG_FORMAT"], availableProfBagSlots[bag], totalProfBagSlots[bag]) .. "]"; + end + if ( TitanGetVar(TITAN_BAG_ID, "ShowColoredText") ) then + bagRichTextProf[bag] = TitanUtils_GetColoredText(bagText, color); + else + bagRichTextProf[bag] = TitanUtils_GetHighlightText(bagText); + end + end + else -- not a profession bag so get used & available counts + local size = GetContainerNumSlots(bag); + if (size and size > 0) then + totalBagSlots = totalBagSlots + size; + for slot = 1, size do + if (GetContainerItemInfo(bag, slot)) then + usedBagSlots = usedBagSlots + 1; + end + end + end + end + end + availableBagSlots = totalBagSlots - usedBagSlots; + + if (TitanGetVar(TITAN_BAG_ID, "ShowUsedSlots")) then + bagText = format(L["TITAN_BAG_FORMAT"], usedBagSlots, totalBagSlots); + else + bagText = format(L["TITAN_BAG_FORMAT"], availableBagSlots, totalBagSlots); + end + + if ( TitanGetVar(TITAN_BAG_ID, "ShowColoredText") ) then + color = TitanUtils_GetThresholdColor(TITAN_BAG_THRESHOLD_TABLE, usedBagSlots / totalBagSlots); + bagRichText = TitanUtils_GetColoredText(bagText, color); + else + bagRichText = TitanUtils_GetHighlightText(bagText); + end + + bagRichText = bagRichText..bagRichTextProf[1]..bagRichTextProf[2]..bagRichTextProf[3]..bagRichTextProf[4]..bagRichTextProf[5]; + + return L["TITAN_BAG_BUTTON_LABEL"], bagRichText; +end + +local function UpdateButton(id) local button, id = TitanUtils_GetButton(id, true); local totalBagSlots, usedBagSlots, availableBagSlots, bag, bagText, bagRichText, color; local totalProfBagSlots = {0,0,0,0,0}; @@ -102,6 +303,9 @@ function TitanPanelBagButton_GetButtonText(id) totalBagSlots = 0; usedBagSlots = 0; for bag = 0, 4 do + + bagType, color = TitanBag_IsProfBag(GetBagName(bag)) + if not TitanBag_IsProfBag(GetBagName(bag)) then local size = GetContainerNumSlots(bag); if (size and size > 0) then @@ -157,9 +361,35 @@ function TitanPanelBagButton_GetButtonText(id) end end bagRichText = bagRichText..bagRichTextProf[1]..bagRichTextProf[2]..bagRichTextProf[3]..bagRichTextProf[4]..bagRichTextProf[5]; + return L["TITAN_BAG_BUTTON_LABEL"], bagRichText; end +function TitanPanelBagButton_GetButtonText(id) + +--TitanDebug("Bags ...") +-- local str1, str2 = UpdateButton(id) +--TitanDebug("> '"..tostring(str1).."' '"..tostring(str2).."'") +--TitanDebug("Bags new ...") + local strA, strB = TextTest(id) +--TitanDebug("> '"..tostring(strA).."' '"..tostring(strB).."'") +--[[ + local cmp = "" + + if str1 == strA and str2 == strB then + -- old & new are the same + cmp = " == " + else + cmp = " ~= " + end +--]] +-- TitanDebug("BagText "..cmp.." '"..tostring(str1).."' '"..tostring(strA).."'") +-- TitanDebug(" >>>>>> ".." '"..tostring(str2).."' '"..tostring(strB).."'") + + + return strA, strB +end + -- ************************************************************************** -- NAME : TitanPanelBagButton_GetTooltipText() -- DESC : Display tooltip text diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index b24c81f..b185ba6 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa006.00.00.90001|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.lua b/TitanClock/TitanClock.lua index 285c398..cfa9460 100644 --- a/TitanClock/TitanClock.lua +++ b/TitanClock/TitanClock.lua @@ -256,8 +256,10 @@ function TitanPanelClockControlSlider_OnShow(self) _G[self:GetName().."Text"]:SetText(TitanPanelClock_GetOffsetText(TitanGetVar(TITAN_CLOCK_ID, "OffsetHour"))); _G[self:GetName().."High"]:SetText(L["TITAN_CLOCK_CONTROL_LOW"]); _G[self:GetName().."Low"]:SetText(L["TITAN_CLOCK_CONTROL_HIGH"]); +-- self:SetThumbTexture("Interface\Buttons\UI-SliderBar-Button-Vertical") self:SetMinMaxValues(-12, 12); self:SetValueStep(0.5); + self:SetObeyStepOnDrag(true) -- since 5.4.2 (Mists of Pandaria) self:SetValue(0 - TitanGetVar(TITAN_CLOCK_ID, "OffsetHour")); local position = TitanUtils_GetRealPosition(TITAN_CLOCK_ID); @@ -328,8 +330,9 @@ end function TitanPanelClockControlSlider_OnValueChanged(self, a1) - _G[self:GetName().."Text"]:SetText(TitanPanelClock_GetOffsetText(0 - self:GetValue())); - TitanSetVar(TITAN_CLOCK_ID, "OffsetHour", 0 - self:GetValue()); + local step = self:GetValue() + _G[self:GetName().."Text"]:SetText(TitanPanelClock_GetOffsetText(0 - step)); + TitanSetVar(TITAN_CLOCK_ID, "OffsetHour", 0 - step); if ( ServerTimeOffsets[realmName] ) then ServerTimeOffsets[realmName] = TitanGetVar(TITAN_CLOCK_ID, "OffsetHour"); end @@ -415,6 +418,13 @@ end -- ************************************************************************** function TitanPanelClockControlFrame_OnLoad(self) _G[self:GetName().."Title"]:SetText(L["TITAN_CLOCK_CONTROL_TITLE"]); +--[[ +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) +so inherit the template (XML) +and set the values in the code (Lua) +--]] + self:SetBackdrop(BACKDROP_SLIDER_8_8) -- use a pre-set from Backdrop.lua BACKDROP_TOOLTIP_16_16_5555 + self:SetBackdropBorderColor(1, 1, 1); self:SetBackdropColor(0, 0, 0, 1); end diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 3df3dcd..9ebfecd 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa006.00.00.90001|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanClock/TitanClock.xml b/TitanClock/TitanClock.xml index a37cf72..33b0247 100644 --- a/TitanClock/TitanClock.xml +++ b/TitanClock/TitanClock.xml @@ -1,10 +1,15 @@ <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"> <Script file="TitanClock.lua"/> - <Frame name="TitanPanelClockControlFrameTemplate" virtual="true" hidden="true"> + <Frame name="TitanPanelClockControlFrameTemplate" inherits="BackdropTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="90" y="200" /> </Size> +<!-- +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) so inherit the template +and set the values in the code. +--> +<!-- <Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true"> <EdgeSize> <AbsValue val="16"/> @@ -16,6 +21,7 @@ <AbsInset left="5" right="5" top="5" bottom="5"/> </BackgroundInsets> </Backdrop> +--> <Layers> <Layer> <FontString name="$parentTitle" inherits="GameFontNormalSmall"> @@ -98,7 +104,7 @@ </OnUpdate> </Scripts> </Frame> - <Frame parent="UIParent"> + <Frame parent="UIParent" inherits="BackdropTemplate"> <Frames> <Button name="TitanPanelClockButton" inherits="TitanPanelTextTemplate" frameStrata="FULLSCREEN" toplevel="true"> <Scripts> diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index 74fffc2..ad9565e 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa006.00.00.90001|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index 104f0d9..3716d49 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa006.00.00.90001|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 4725285..1730b79 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa006.00.00.90001|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua index d2c3bfc..7a2cccb 100644 --- a/TitanPerformance/TitanPerformance.lua +++ b/TitanPerformance/TitanPerformance.lua @@ -722,14 +722,16 @@ function TitanPanelPerfControlSlider_OnShow(self) _G[self:GetName().."Low"]:SetText(L["TITAN_PERFORMANCE_CONTROL_HIGH"]); self:SetMinMaxValues(APP_MIN, APP_MAX); self:SetValueStep(1); + self:SetObeyStepOnDrag(true) -- since 5.4.2 (Mists of Pandaria) self:SetValue(CalcAppNum(TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons"))); -- self:SetValue((TitanGetVar(TITAN_PERFORMANCE_ID, "NumOfAddons"))); TitanPanelPerfControlFrame:SetBackdropColor(0, 0, 0, 1) +--[[ TitanDebug("Slider_OnShow:" .." : "..(self:GetValue() or "?") .." : "..(self:GetValueStep() or "?") ); - +--]] local scale = _G[drop_down.."1"]:GetScale() local drop_arrow = drop_down.."2Button4ExpandArrow" TitanPanelPerfControlFrame:ClearAllPoints(); @@ -752,10 +754,12 @@ end function TitanPanelPerfControlSlider_OnValueChanged(self, a1) local val = CalcAppNum(self:GetValue()) -- grab new value +--[[ TitanDebug("Slider_OnValueChanged:" .." : "..(self:GetValue() or "?") .." : "..(val or "?") ); +--]] _G[self:GetName().."Text"]:SetText(val); --[[ if a1 == -1 then @@ -803,6 +807,13 @@ end -- ************************************************************************** function TitanPanelPerfControlFrame_OnLoad(self) _G[self:GetName().."Title"]:SetText(L["TITAN_PERFORMANCE_CONTROL_TITLE"]); +--[[ +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) +so inherit the template (XML) +and set the values in the code (Lua) +--]] + self:SetBackdrop(BACKDROP_TOOLTIP_16_16_5555) -- use a pre-set from Backdrop.lua + self:SetBackdropBorderColor(1, 1, 1); self:SetBackdropColor(0, 0, 0, 1); end diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 54e8d06..3296fd8 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa006.00.00.90001|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanPerformance/TitanPerformance.xml b/TitanPerformance/TitanPerformance.xml index 4e37b2c..0e369e5 100644 --- a/TitanPerformance/TitanPerformance.xml +++ b/TitanPerformance/TitanPerformance.xml @@ -1,10 +1,13 @@ <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"> <Script file="TitanPerformance.lua"/> - <Frame name="TitanPanelPerfControlFrameTemplate" virtual="true" hidden="true"> + <Frame name="TitanPanelPerfControlFrameTemplate" inherits="BackdropTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="120" y="170" /> </Size> +<!-- +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) so inherit the template +and set the values in the code. <Backdrop bgFile="Interface\FullScreenTextures\OutOfControl" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true"> <EdgeSize> <AbsValue val="16"/> @@ -16,6 +19,7 @@ <AbsInset left="2" right="2" top="2" bottom="2"/> </BackgroundInsets> </Backdrop> +--> <Layers> <Layer> <FontString name="$parentTitle" inherits="GameFontNormalSmall"> diff --git a/TitanRepair/TitanRepair.lua b/TitanRepair/TitanRepair.lua index a611f7d..5f66341 100644 --- a/TitanRepair/TitanRepair.lua +++ b/TitanRepair/TitanRepair.lua @@ -1397,7 +1397,7 @@ function TitanRepair_DurabilityFrame(isOnShow) if TitanGetVar(TITAN_REPAIR_ID,"ShowDurabilityFrame") then -- Prevent a circular reference by checking if function was triggered by our SecureHook into OnShow. -- If OnShow didn't trigger this just do whatever Blizzard wants. - if not isOnShow then DurabilityFrame_SetAlerts() end + if not isOnShow then DurabilityFrameMixin:SetAlerts() end -- DurabilityFrame_SetAlerts() end else -- Always hide this frame since user wants it hidden. DurabilityFrame:Hide() diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index 6caa47e..659fc44 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa006.00.00.90001|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.lua b/TitanVolume/TitanVolume.lua index 13c6128..9a4eb1b 100644 --- a/TitanVolume/TitanVolume.lua +++ b/TitanVolume/TitanVolume.lua @@ -78,6 +78,7 @@ function TitanPanelMasterVolumeControlSlider_OnShow(self) _G[self:GetName().."Low"]:SetText(L["TITAN_VOLUME_CONTROL_HIGH"]); self:SetMinMaxValues(0, 1); self:SetValueStep(0.01); + self:SetObeyStepOnDrag(true) -- since 5.4.2 (Mists of Pandaria) self:SetValue(1 - GetCVar("Sound_MasterVolume")); local position = TitanUtils_GetRealPosition(TITAN_VOLUME_ID); @@ -357,6 +358,13 @@ function TitanPanelVolumeControlFrame_OnLoad(self) _G[self:GetName().."DialogTitle"]:SetText(L["TITAN_VOLUME_DIALOG_CONTROL_TITLE"]); -- _G[self:GetName().."MicrophoneTitle"]:SetText(L["TITAN_VOLUME_MICROPHONE_CONTROL_TITLE"]); -- _G[self:GetName().."SpeakerTitle"]:SetText(L["TITAN_VOLUME_SPEAKER_CONTROL_TITLE"]); +--[[ +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) +so inherit the template (XML) +and set the values in the code (Lua) +--]] + self:SetBackdrop(BACKDROP_TOOLTIP_16_16_5555) -- use a pre-set from Backdrop.lua + self:SetBackdropBorderColor(1, 1, 1); self:SetBackdropColor(0, 0, 0, 1); end diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index 78a95a6..c6be0f5 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa006.00.00.90001|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanVolume/TitanVolume.xml b/TitanVolume/TitanVolume.xml index dc839b9..22b75ce 100644 --- a/TitanVolume/TitanVolume.xml +++ b/TitanVolume/TitanVolume.xml @@ -1,10 +1,13 @@ <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"> <Script file="TitanVolume.lua"/> - <Frame name="TitanPanelVolumeControlFrameTemplate" virtual="true" hidden="true"> + <Frame name="TitanPanelVolumeControlFrameTemplate" inherits="BackdropTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="400" y="200" /> </Size> +<!-- +Blizzard decided to remove direct Backdrop API in 9.0 (Shadowlands) so inherit the template +and set the values in the code. <Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true"> <EdgeSize> <AbsValue val="16"/> @@ -16,6 +19,7 @@ <AbsInset left="5" right="5" top="5" bottom="5"/> </BackgroundInsets> </Backdrop> +--> <Layers> <Layer> <FontString name="$parentTitle" inherits="GameFontNormalSmall"> diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 80d8ea5..2a32ef9 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ -## Interface: 80300 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.18.7.80300|r +## Interface: 90001 +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa006.00.00.90001|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.18.7.80300 +## Version: 6.00.00.90001 ## X-Child-Of: Titan TitanXP.xml