Commit 16426316 authored by Simpy's avatar Simpy 🐹
Browse files

Revert "Toolkit - @Simpy"

This reverts commit f58dfcf1.

# Conflicts:
#	ElvUI/Core/Config.lua
#	ElvUI/Core/Install.lua
#	ElvUI/Core/Movers.lua
#	ElvUI/Core/PluginInstaller.lua
#	ElvUI/Core/Toolkit.lua
#	ElvUI/Layout/Layout.lua
#	ElvUI/Modules/ActionBars/ActionBars.lua
#	ElvUI/Modules/ActionBars/Bind.lua
#	ElvUI/Modules/ActionBars/MicroBar.lua
#	ElvUI/Modules/ActionBars/StanceBar.lua
#	ElvUI/Modules/Bags/BagBar.lua
#	ElvUI/Modules/Blizzard/AlertFrame.lua
#	ElvUI/Modules/Blizzard/AltPower.lua
#	ElvUI/Modules/Blizzard/Blizzard.lua
#	ElvUI/Modules/Blizzard/CaptureBar.lua
#	ElvUI/Modules/Blizzard/ColorPicker.lua
#	ElvUI/Modules/Blizzard/GM.lua
#	ElvUI/Modules/Blizzard/LevelUpBossBanner.lua
#	ElvUI/Modules/Blizzard/ObjectiveFrame.lua
#	ElvUI/Modules/Blizzard/Vehicle.lua
#	ElvUI/Modules/Blizzard/WidgetsUI.lua
#	ElvUI/Modules/Chat/Chat.lua
#	ElvUI/Modules/Maps/Minimap.lua
#	ElvUI/Modules/Maps/Worldmap.lua
#	ElvUI/Modules/Misc/ChatBubbles.lua
#	ElvUI/Modules/Misc/DebugTools.lua
#	ElvUI/Modules/Misc/InfoItemLevel.lua
#	ElvUI/Modules/Misc/LootRoll.lua
#	ElvUI/Modules/Misc/Misc.lua
#	ElvUI/Modules/Misc/RaidMarker.lua
#	ElvUI/Modules/Misc/RaidUtility.lua
#	ElvUI/Modules/Nameplates/Elements/CastBar.lua
#	ElvUI/Modules/Nameplates/Elements/Health.lua
#	ElvUI/Modules/Nameplates/Elements/Plugins.lua
#	ElvUI/Modules/Nameplates/Elements/Portraits.lua
#	ElvUI/Modules/Nameplates/Elements/Power.lua
#	ElvUI/Modules/Nameplates/Elements/PvP.lua
#	ElvUI/Modules/Nameplates/Elements/RaidTargetIndicator.lua
#	ElvUI/Modules/Nameplates/Elements/Tags.lua
#	ElvUI/Modules/Nameplates/Nameplates.lua
#	ElvUI/Modules/Nameplates/Plugins/QuestIcons.lua
#	ElvUI/Modules/Skins/Addons/Ace3.lua
#	ElvUI/Modules/Skins/Blizzard/Achievement.lua
#	ElvUI/Modules/Skins/Blizzard/Alerts.lua
#	ElvUI/Modules/Skins/Blizzard/Archaeology.lua
#	ElvUI/Modules/Skins/Blizzard/Artifact.lua
#	ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua
#	ElvUI/Modules/Skins/Blizzard/AzeriteEssence.lua
#	ElvUI/Modules/Skins/Blizzard/AzeriteRespec.lua
#	ElvUI/Modules/Skins/Blizzard/Bags.lua
#	ElvUI/Modules/Skins/Blizzard/Binding.lua
#	ElvUI/Modules/Skins/Blizzard/BlackMarket.lua
#	ElvUI/Modules/Skins/Blizzard/BlizzardOptions.lua
#	ElvUI/Modules/Skins/Blizzard/Calendar.lua
#	ElvUI/Modules/Skins/Blizzard/Character.lua
#	ElvUI/Modules/Skins/Blizzard/CombatLog.lua
#	ElvUI/Modules/Skins/Blizzard/Communities.lua
#	ElvUI/Modules/Skins/Blizzard/Debug.lua
#	ElvUI/Modules/Skins/Blizzard/DressingRoom.lua
#	ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua
#	ElvUI/Modules/Skins/Blizzard/Friends.lua
#	ElvUI/Modules/Skins/Blizzard/GMChat.lua
#	ElvUI/Modules/Skins/Blizzard/Garrison.lua
#	ElvUI/Modules/Skins/Blizzard/GarrisonTemplate.lua
#	ElvUI/Modules/Skins/Blizzard/Gossip.lua
#	ElvUI/Modules/Skins/Blizzard/Guild.lua
#	ElvUI/Modules/Skins/Blizzard/GuildBank.lua
#	ElvUI/Modules/Skins/Blizzard/GuildControl.lua
#	ElvUI/Modules/Skins/Blizzard/Help.lua
#	ElvUI/Modules/Skins/Blizzard/Inspect.lua
#	ElvUI/Modules/Skins/Blizzard/ItemInteraction.lua
#	ElvUI/Modules/Skins/Blizzard/ItemUpgrade.lua
#	ElvUI/Modules/Skins/Blizzard/LFG.lua
#	ElvUI/Modules/Skins/Blizzard/Loot.lua
#	ElvUI/Modules/Skins/Blizzard/LossControl.lua
#	ElvUI/Modules/Skins/Blizzard/Macro.lua
#	ElvUI/Modules/Skins/Blizzard/Mail.lua
#	ElvUI/Modules/Skins/Blizzard/Merchant.lua
#	ElvUI/Modules/Skins/Blizzard/MirrorTimers.lua
#	ElvUI/Modules/Skins/Blizzard/Misc.lua
#	ElvUI/Modules/Skins/Blizzard/NonRaid.lua
#	ElvUI/Modules/Skins/Blizzard/ObjectiveTracker.lua
#	ElvUI/Modules/Skins/Blizzard/PVP.lua
#	ElvUI/Modules/Skins/Blizzard/PetBattle.lua
#	ElvUI/Modules/Skins/Blizzard/Petition.lua
#	ElvUI/Modules/Skins/Blizzard/Quest.lua
#	ElvUI/Modules/Skins/Blizzard/Socket.lua
#	ElvUI/Modules/Skins/Blizzard/SpellBook.lua
#	ElvUI/Modules/Skins/Blizzard/Stable.lua
#	ElvUI/Modules/Skins/Blizzard/Tabard.lua
#	ElvUI/Modules/Skins/Blizzard/Talent.lua
#	ElvUI/Modules/Skins/Blizzard/TalkingHead.lua
#	ElvUI/Modules/Skins/Blizzard/TimeManager.lua
#	ElvUI/Modules/Skins/Blizzard/Tooltip.lua
#	ElvUI/Modules/Skins/Blizzard/Trade.lua
#	ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
#	ElvUI/Modules/Skins/Blizzard/Trainer.lua
#	ElvUI/Modules/Skins/Blizzard/VoidStorage.lua
#	ElvUI/Modules/Skins/Blizzard/WarfrontPartyPose.lua
#	ElvUI/Modules/Skins/Blizzard/WorldMap.lua
#	ElvUI/Modules/Skins/Skins.lua
#	ElvUI/Modules/Tooltip/Tooltip.lua
#	ElvUI/Modules/UnitFrames/Elements/AltPower.lua
#	ElvUI/Modules/UnitFrames/Elements/AuraBars.lua
#	ElvUI/Modules/UnitFrames/Elements/CastBar.lua
#	ElvUI/Modules/UnitFrames/Elements/ClassBars.lua
#	ElvUI/Modules/UnitFrames/Elements/CombatIndicator.lua
#	ElvUI/Modules/UnitFrames/Elements/Cutaway.lua
#	ElvUI/Modules/UnitFrames/Elements/FrameGlow.lua
#	ElvUI/Modules/UnitFrames/Elements/HealPrediction.lua
#	ElvUI/Modules/UnitFrames/Elements/Health.lua
#	ElvUI/Modules/UnitFrames/Elements/InfoPanel.lua
#	ElvUI/Modules/UnitFrames/Elements/PVPSpecIcon.lua
#	ElvUI/Modules/UnitFrames/Elements/Portrait.lua
#	ElvUI/Modules/UnitFrames/Elements/Power.lua
#	ElvUI/Modules/UnitFrames/Elements/PowerPrediction.lua
#	ElvUI/Modules/UnitFrames/Elements/RaidIcon.lua
#	ElvUI/Modules/UnitFrames/Elements/ReadyCheckIcon.lua
#	ElvUI/Modules/UnitFrames/Elements/RestingIndicator.lua
#	ElvUI/Modules/UnitFrames/Elements/ResurrectionIcon.lua
#	ElvUI/Modules/UnitFrames/Elements/RoleIcons.lua
#	ElvUI/Modules/UnitFrames/Elements/SummonIndicator.lua
#	ElvUI/Modules/UnitFrames/Elements/Threat.lua
#	ElvUI/Modules/UnitFrames/Groups/Arena.lua
#	ElvUI/Modules/UnitFrames/Groups/Raid.lua
#	ElvUI/Modules/UnitFrames/UnitFrames.lua
#	ElvUI/Modules/UnitFrames/Units/Player.lua
parent ddbf8ca0
......@@ -270,7 +270,7 @@ do
helloKittyLeft:SetMovable(true)
helloKittyLeft:EnableMouse(true)
helloKittyLeft:RegisterForDrag('LeftButton')
helloKittyLeft:SetPoint('BOTTOMLEFT', _G.LeftChatPanel, 'BOTTOMRIGHT', 2, -4)
helloKittyLeft:Point('BOTTOMLEFT', _G.LeftChatPanel, 'BOTTOMRIGHT', 2, -4)
helloKittyLeft.tex = helloKittyLeft:CreateTexture(nil, 'OVERLAY')
helloKittyLeft.tex:SetAllPoints()
helloKittyLeft.tex:SetTexture(E.Media.Textures.HelloKitty)
......@@ -287,7 +287,7 @@ do
helloKittyRight:SetMovable(true)
helloKittyRight:EnableMouse(true)
helloKittyRight:RegisterForDrag('LeftButton')
helloKittyRight:SetPoint('BOTTOMRIGHT', _G.RightChatPanel, 'BOTTOMLEFT', -2, -4)
helloKittyRight:Point('BOTTOMRIGHT', _G.RightChatPanel, 'BOTTOMLEFT', -2, -4)
helloKittyRight.tex = helloKittyRight:CreateTexture(nil, 'OVERLAY')
helloKittyRight.tex:SetAllPoints()
helloKittyRight.tex:SetTexture(E.Media.Textures.HelloKitty)
......
......@@ -230,7 +230,7 @@ function E:NudgeMover(nudgeX, nudgeY)
local x, y, point = E:CalculateMoverPoints(mover, nudgeX, nudgeY)
mover:ClearAllPoints()
mover:SetPoint(point, E.UIParent, point, x, y)
mover:Point(point, E.UIParent, point, x, y)
E:SaveMoverPosition(mover.name)
--Update coordinates in Nudge Window
......@@ -268,7 +268,7 @@ function E:CreateMoverPopup()
f:SetClampedToScreen(true)
f:Size(370, 190)
f:SetTemplate('Transparent')
f:SetPoint('BOTTOM', _G.UIParent, 'CENTER', 0, 100)
f:Point('BOTTOM', _G.UIParent, 'CENTER', 0, 100)
f:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
f:SetScript('OnShow', E.MoverPopupOnShow)
f:CreateShadow(5)
......@@ -288,15 +288,15 @@ function E:CreateMoverPopup()
local title = header:CreateFontString(nil, 'OVERLAY')
title:FontTemplate()
title:SetPoint('CENTER', header, 'CENTER')
title:Point('CENTER', header, 'CENTER')
title:SetText('ElvUI')
local desc = f:CreateFontString(nil, 'ARTWORK')
desc:SetFontObject('GameFontHighlight')
desc:SetJustifyV('TOP')
desc:SetJustifyH('LEFT')
desc:SetPoint('TOPLEFT', 18, -20)
desc:SetPoint('BOTTOMRIGHT', -18, 48)
desc:Point('TOPLEFT', 18, -20)
desc:Point('BOTTOMRIGHT', -18, 48)
desc:SetText(L["DESC_MOVERCONFIG"])
local snapping = CreateFrame('CheckButton', f:GetName()..'CheckButton', f, 'OptionsCheckButtonTemplate')
......@@ -350,13 +350,13 @@ function E:CreateMoverPopup()
end)
align.text = align:CreateFontString(nil, 'OVERLAY', 'GameFontNormal')
align.text:SetPoint('RIGHT', align, 'LEFT', -4, 0)
align.text:Point('RIGHT', align, 'LEFT', -4, 0)
align.text:SetText(L["Grid Size:"])
--position buttons
snapping:SetPoint('BOTTOMLEFT', 14, 10)
lock:SetPoint('BOTTOMRIGHT', -14, 14)
align:SetPoint('TOPRIGHT', lock, 'TOPLEFT', -4, -2)
snapping:Point('BOTTOMLEFT', 14, 10)
lock:Point('BOTTOMRIGHT', -14, 14)
align:Point('TOPRIGHT', lock, 'TOPLEFT', -4, -2)
S:HandleCheckBox(snapping)
S:HandleButton(lock)
......@@ -372,10 +372,10 @@ function E:CreateMoverPopup()
end)
local configMode = CreateFrame('Frame', f:GetName()..'DropDown', f, 'UIDropDownMenuTemplate')
configMode:SetPoint('BOTTOMRIGHT', lock, 'TOPRIGHT', 8, -5)
configMode:Point('BOTTOMRIGHT', lock, 'TOPRIGHT', 8, -5)
S:HandleDropDownBox(configMode, 165)
configMode.text = configMode:CreateFontString(nil, 'OVERLAY', 'GameFontNormal')
configMode.text:SetPoint('RIGHT', configMode.backdrop, 'LEFT', -2, 0)
configMode.text:Point('RIGHT', configMode.backdrop, 'LEFT', -2, 0)
configMode.text:SetText(L["Config Mode:"])
_G.UIDropDownMenu_Initialize(configMode, ConfigMode_Initialize)
......@@ -410,8 +410,8 @@ function E:CreateMoverPopup()
desc:SetFontObject('GameFontHighlight')
desc:SetJustifyV('TOP')
desc:SetJustifyH('LEFT')
desc:SetPoint('TOPLEFT', 18, -15)
desc:SetPoint('BOTTOMRIGHT', -18, 28)
desc:Point('TOPLEFT', 18, -15)
desc:Point('BOTTOMRIGHT', -18, 28)
desc:SetJustifyH('CENTER')
nudgeFrame.title = desc
......@@ -426,7 +426,7 @@ function E:CreateMoverPopup()
title = header:CreateFontString(nil, 'OVERLAY')
title:FontTemplate()
title:SetPoint('CENTER', header, 'CENTER')
title:Point('CENTER', header, 'CENTER')
title:SetText(L["Nudge"])
nudgeFrame.title = title
......@@ -458,9 +458,9 @@ function E:CreateMoverPopup()
end)
xOffset.text = xOffset:CreateFontString(nil, 'OVERLAY', 'GameFontNormal')
xOffset.text:SetPoint('RIGHT', xOffset, 'LEFT', -4, 0)
xOffset.text:Point('RIGHT', xOffset, 'LEFT', -4, 0)
xOffset.text:SetText('X:')
xOffset:SetPoint('BOTTOMRIGHT', nudgeFrame, 'CENTER', -6, 8)
xOffset:Point('BOTTOMRIGHT', nudgeFrame, 'CENTER', -6, 8)
S:HandleEditBox(xOffset)
nudgeFrame.xOffset = xOffset
......@@ -492,15 +492,15 @@ function E:CreateMoverPopup()
end)
yOffset.text = yOffset:CreateFontString(nil, 'OVERLAY', 'GameFontNormal')
yOffset.text:SetPoint('RIGHT', yOffset, 'LEFT', -4, 0)
yOffset.text:Point('RIGHT', yOffset, 'LEFT', -4, 0)
yOffset.text:SetText('Y:')
yOffset:SetPoint('BOTTOMLEFT', nudgeFrame, 'CENTER', 16, 8)
yOffset:Point('BOTTOMLEFT', nudgeFrame, 'CENTER', 16, 8)
S:HandleEditBox(yOffset)
nudgeFrame.yOffset = yOffset
local resetButton = CreateFrame('Button', nudgeFrame:GetName()..'ResetButton', nudgeFrame, 'UIPanelButtonTemplate, BackdropTemplate')
resetButton:SetText(RESET)
resetButton:SetPoint('TOP', nudgeFrame, 'CENTER', 0, 2)
resetButton:Point('TOP', nudgeFrame, 'CENTER', 0, 2)
resetButton:Size(100, 25)
resetButton:SetScript('OnClick', function()
if ElvUIMoverNudgeWindow.child.textString then
......@@ -511,7 +511,7 @@ function E:CreateMoverPopup()
nudgeFrame.resetButton = resetButton
local upButton = CreateFrame('Button', nudgeFrame:GetName()..'UpButton', nudgeFrame, 'BackdropTemplate')
upButton:SetPoint('BOTTOMRIGHT', nudgeFrame, 'BOTTOM', -6, 4)
upButton:Point('BOTTOMRIGHT', nudgeFrame, 'BOTTOM', -6, 4)
upButton:SetScript('OnClick', function() E:NudgeMover(nil, 1) end)
S:HandleNextPrevButton(upButton)
S:HandleButton(upButton)
......@@ -519,7 +519,7 @@ function E:CreateMoverPopup()
nudgeFrame.upButton = upButton
local downButton = CreateFrame('Button', nudgeFrame:GetName()..'DownButton', nudgeFrame, 'BackdropTemplate')
downButton:SetPoint('BOTTOMLEFT', nudgeFrame, 'BOTTOM', 6, 4)
downButton:Point('BOTTOMLEFT', nudgeFrame, 'BOTTOM', 6, 4)
downButton:SetScript('OnClick', function() E:NudgeMover(nil, -1) end)
S:HandleNextPrevButton(downButton)
S:HandleButton(downButton)
......@@ -527,7 +527,7 @@ function E:CreateMoverPopup()
nudgeFrame.downButton = downButton
local leftButton = CreateFrame('Button', nudgeFrame:GetName()..'LeftButton', nudgeFrame, 'BackdropTemplate')
leftButton:SetPoint('RIGHT', upButton, 'LEFT', -6, 0)
leftButton:Point('RIGHT', upButton, 'LEFT', -6, 0)
leftButton:SetScript('OnClick', function() E:NudgeMover(-1) end)
S:HandleNextPrevButton(leftButton)
S:HandleButton(leftButton)
......@@ -535,7 +535,7 @@ function E:CreateMoverPopup()
nudgeFrame.leftButton = leftButton
local rightButton = CreateFrame('Button', nudgeFrame:GetName()..'RightButton', nudgeFrame, 'BackdropTemplate')
rightButton:SetPoint('LEFT', downButton, 'RIGHT', 6, 0)
rightButton:Point('LEFT', downButton, 'RIGHT', 6, 0)
rightButton:SetScript('OnClick', function() E:NudgeMover(1) end)
S:HandleNextPrevButton(rightButton)
S:HandleButton(rightButton)
......@@ -645,12 +645,12 @@ local function ConfigSliderOnMouseWheel(self, offset)
if newValue > maxValue then return end
self:SetValue(newValue)
self.buttons:SetPoint('TOPLEFT', 0, newValue * 36)
self.buttons:Point('TOPLEFT', 0, newValue * 36)
end
local function ConfigSliderOnValueChanged(self, value)
self:SetValue(value)
self.buttons:SetPoint('TOPLEFT', 0, value * 36)
self.buttons:Point('TOPLEFT', 0, value * 36)
end
function E:Config_SetButtonText(btn, noColor)
......@@ -669,7 +669,7 @@ function E:Config_CreateSeparatorLine(frame, lastButton)
line:SetTexture(E.Media.Textures.White8x8)
line:SetVertexColor(1, .82, 0, .4)
line:Size(179, 2)
line:SetPoint('TOP', lastButton, 'BOTTOM', 0, -6)
line:Point('TOP', lastButton, 'BOTTOM', 0, -6)
line.separator = true
return line
end
......@@ -753,7 +753,7 @@ function E:Config_UpdateLeftScroller(frame)
local btns = left.buttons
local bottom = btns:GetBottom()
if not bottom then return end
btns:SetPoint('TOPLEFT', 0, 0)
btns:Point('TOPLEFT', 0, 0)
local max = 0
for _, btn in ipairs(btns) do
......@@ -796,7 +796,7 @@ function E:Config_RestoreOldPosition(frame)
if position then
frame:ClearAllPoints()
for i = 1, #position do
frame:SetPoint(unpack(position[i]))
frame:Point(unpack(position[i]))
end
end
end
......@@ -834,9 +834,9 @@ function E:Config_CreateLeftButtons(frame, unskinned, options)
btn:Width(177)
if not last then
btn:SetPoint('TOP', buttons, 'TOP', 0, 0)
btn:Point('TOP', buttons, 'TOP', 0, 0)
else
btn:SetPoint('TOP', last, 'BOTTOM', 0, (last.separator and -6) or -4)
btn:Point('TOP', last, 'BOTTOM', 0, (last.separator and -6) or -4)
end
buttons[index] = btn
......@@ -926,14 +926,14 @@ function E:Config_WindowOpened(frame)
local version = frame.topHolder.version
E:Config_SaveOldPosition(version)
version:ClearAllPoints()
version:SetPoint('LEFT', frame.topHolder, 'LEFT', unskinned and 8 or 6, unskinned and -4 or 0)
version:Point('LEFT', frame.topHolder, 'LEFT', unskinned and 8 or 6, unskinned and -4 or 0)
local holderHeight = frame.bottomHolder:GetHeight()
local content = frame.obj.content
E:Config_SaveOldPosition(content)
content:ClearAllPoints()
content:SetPoint('TOPLEFT', frame, 'TOPLEFT', offset, -(unskinned and 50 or 40))
content:SetPoint('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -offset, holderHeight + 3)
content:Point('TOPLEFT', frame, 'TOPLEFT', offset, -(unskinned and 50 or 40))
content:Point('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -offset, holderHeight + 3)
local titlebg = frame.obj.titlebg
E:Config_SaveOldPosition(titlebg)
......@@ -1001,10 +1001,10 @@ function E:Config_CreateBottomButtons(frame, unskinned)
local offset = unskinned and 14 or 8
if not last then
btn:SetPoint('BOTTOMLEFT', frame.bottomHolder, 'BOTTOMLEFT', unskinned and 24 or offset, offset)
btn:Point('BOTTOMLEFT', frame.bottomHolder, 'BOTTOMLEFT', unskinned and 24 or offset, offset)
last = btn
else
btn:SetPoint('LEFT', last, 'RIGHT', 4, 0)
btn:Point('LEFT', last, 'RIGHT', 4, 0)
last = btn
end
......
......@@ -169,7 +169,7 @@ function E:CreateCooldownTimer(parent)
parent.timer = timer
local text = timer:CreateFontString(nil, 'OVERLAY')
text:SetPoint('CENTER', 1, 1)
text:Point('CENTER', 1, 1)
text:SetJustifyH('CENTER')
timer.text = text
......
......@@ -38,7 +38,7 @@ function D:Initialize()
self.statusBar:Size(250, 18)
self.statusBar.text = self.statusBar:CreateFontString(nil, 'OVERLAY')
self.statusBar.text:FontTemplate()
self.statusBar.text:SetPoint('CENTER')
self.statusBar.text:Point('CENTER')
self.statusBar:Hide()
end
......
......@@ -66,9 +66,9 @@ function E:DropDown(list, frame, xOffset, yOffset)
frame.buttons[i]:SetScript('OnClick', OnClick)
if i == 1 then
frame.buttons[i]:SetPoint('TOPLEFT', frame, 'TOPLEFT', PADDING, -PADDING)
frame.buttons[i]:Point('TOPLEFT', frame, 'TOPLEFT', PADDING, -PADDING)
else
frame.buttons[i]:SetPoint('TOPLEFT', frame.buttons[i-1], 'BOTTOMLEFT')
frame.buttons[i]:Point('TOPLEFT', frame.buttons[i-1], 'BOTTOMLEFT')
end
end
......@@ -80,7 +80,7 @@ function E:DropDown(list, frame, xOffset, yOffset)
x = x/UIScale
y = y/UIScale
frame:ClearAllPoints()
frame:SetPoint('TOPLEFT', _G.UIParent, 'BOTTOMLEFT', x + xOffset, y + yOffset)
frame:Point('TOPLEFT', _G.UIParent, 'BOTTOMLEFT', x + xOffset, y + yOffset)
ToggleFrame(frame)
end
......@@ -67,10 +67,10 @@ function E:SetupChat(noDisplayMsg)
-- move general bottom left
if id == 1 then
frame:ClearAllPoints()
frame:SetPoint('BOTTOMLEFT', _G.LeftChatToggleButton, 'TOPLEFT', 1, 3)
frame:Point('BOTTOMLEFT', _G.LeftChatToggleButton, 'TOPLEFT', 1, 3)
elseif id == 3 then
frame:ClearAllPoints()
frame:SetPoint('BOTTOMLEFT', _G.RightChatDataPanel, 'TOPLEFT', 1, 3)
frame:Point('BOTTOMLEFT', _G.RightChatDataPanel, 'TOPLEFT', 1, 3)
end
FCF_SavePositionAndDimensions(frame)
......@@ -679,7 +679,7 @@ function E:Install()
if not _G.InstallStepComplete then
local imsg = CreateFrame('Frame', 'InstallStepComplete', E.UIParent)
imsg:Size(418, 72)
imsg:SetPoint('TOP', 0, -190)
imsg:Point('TOP', 0, -190)
imsg:Hide()
imsg:SetScript('OnShow', function(f)
if f.message then
......@@ -697,7 +697,7 @@ function E:Install()
imsg.bg = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.bg:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.bg:SetPoint('BOTTOM')
imsg.bg:Point('BOTTOM')
imsg.bg:Size(326, 103)
imsg.bg:SetTexCoord(0.00195313, 0.63867188, 0.03710938, 0.23828125)
imsg.bg:SetVertexColor(1, 1, 1, 0.6)
......@@ -705,19 +705,19 @@ function E:Install()
imsg.lineTop = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.lineTop:SetDrawLayer('BACKGROUND', 2)
imsg.lineTop:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.lineTop:SetPoint('TOP')
imsg.lineTop:Point('TOP')
imsg.lineTop:Size(418, 7)
imsg.lineTop:SetTexCoord(0.00195313, 0.81835938, 0.01953125, 0.03320313)
imsg.lineBottom = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.lineBottom:SetDrawLayer('BACKGROUND', 2)
imsg.lineBottom:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.lineBottom:SetPoint('BOTTOM')
imsg.lineBottom:Point('BOTTOM')
imsg.lineBottom:Size(418, 7)
imsg.lineBottom:SetTexCoord(0.00195313, 0.81835938, 0.01953125, 0.03320313)
imsg.text = imsg:CreateFontString(nil, 'ARTWORK', 'GameFont_Gigantic')
imsg.text:SetPoint('BOTTOM', 0, 12)
imsg.text:Point('BOTTOM', 0, 12)
imsg.text:SetTextColor(1, 0.82, 0)
imsg.text:SetJustifyH('CENTER')
end
......@@ -728,7 +728,7 @@ function E:Install()
f.SetPage = E.SetPage
f:Size(550, 400)
f:SetTemplate('Transparent')
f:SetPoint('CENTER')
f:Point('CENTER')
f:SetFrameStrata('TOOLTIP')
f:SetMovable(true)
......@@ -739,12 +739,12 @@ function E:Install()
f.Title = f:CreateFontString(nil, 'OVERLAY')
f.Title:FontTemplate(nil, 17, nil)
f.Title:SetPoint('TOP', 0, -5)
f.Title:Point('TOP', 0, -5)
f.Title:SetText(L["ElvUI Installation"])
f.Next = CreateFrame('Button', 'InstallNextButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Next:Size(110, 25)
f.Next:SetPoint('BOTTOMRIGHT', -5, 5)
f.Next:Point('BOTTOMRIGHT', -5, 5)
f.Next:SetText(CONTINUE)
f.Next:Disable()
f.Next:SetScript('OnClick', E.NextPage)
......@@ -752,7 +752,7 @@ function E:Install()
f.Prev = CreateFrame('Button', 'InstallPrevButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Prev:Size(110, 25)
f.Prev:SetPoint('BOTTOMLEFT', 5, 5)
f.Prev:Point('BOTTOMLEFT', 5, 5)
f.Prev:SetText(PREVIOUS)
f.Prev:Disable()
f.Prev:SetScript('OnClick', E.PreviousPage)
......@@ -765,8 +765,8 @@ function E:Install()
E:RegisterStatusBar(f.Status)
f.Status:SetStatusBarColor(1, 0, 0)
f.Status:SetMinMaxValues(0, MAX_PAGE)
f.Status:SetPoint('TOPLEFT', f.Prev, 'TOPRIGHT', 6, -2)
f.Status:SetPoint('BOTTOMRIGHT', f.Next, 'BOTTOMLEFT', -6, 2)
f.Status:Point('TOPLEFT', f.Prev, 'TOPRIGHT', 6, -2)
f.Status:Point('BOTTOMRIGHT', f.Next, 'BOTTOMLEFT', -6, 2)
-- Setup StatusBar Animation
f.Status.anim = _G.CreateAnimationGroup(f.Status)
......@@ -784,93 +784,93 @@ function E:Install()
f.Slider:Height(15)
f.Slider:Width(400)
f.Slider:SetHitRectInsets(0, 0, -10, 0)
f.Slider:SetPoint('CENTER', 0, 45)
f.Slider:Point('CENTER', 0, 45)
S:HandleSliderFrame(f.Slider)
f.Slider:Hide()
f.Slider.Min = f.Slider:CreateFontString(nil, 'ARTWORK', 'GameFontHighlightSmall')
f.Slider.Min:SetPoint('RIGHT', f.Slider, 'LEFT', -3, 0)
f.Slider.Min:Point('RIGHT', f.Slider, 'LEFT', -3, 0)
f.Slider.Max = f.Slider:CreateFontString(nil, 'ARTWORK', 'GameFontHighlightSmall')
f.Slider.Max:SetPoint('LEFT', f.Slider, 'RIGHT', 3, 0)
f.Slider.Max:Point('LEFT', f.Slider, 'RIGHT', 3, 0)
f.Slider.Cur = f.Slider:CreateFontString(nil, 'ARTWORK', 'GameFontHighlightSmall')
f.Slider.Cur:SetPoint('BOTTOM', f.Slider, 'TOP', 0, 10)
f.Slider.Cur:Point('BOTTOM', f.Slider, 'TOP', 0, 10)
f.Slider.Cur:FontTemplate(nil, 30, nil)
f.Option1 = CreateFrame('Button', 'InstallOption1Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option1:Size(160, 30)
f.Option1:SetPoint('BOTTOM', 0, 45)
f.Option1:Point('BOTTOM', 0, 45)
f.Option1:SetText('')
f.Option1:Hide()
S:HandleButton(f.Option1, true)
f.Option2 = CreateFrame('Button', 'InstallOption2Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option2:Size(110, 30)
f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45)
f.Option2:Point('BOTTOMLEFT', f, 'BOTTOM', 4, 45)
f.Option2:SetText('')
f.Option2:Hide()
f.Option2:SetScript('OnShow', function() f.Option1:Width(110); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOMRIGHT', f, 'BOTTOM', -4, 45) end)
f.Option2:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOM', 0, 45) end)
f.Option2:SetScript('OnShow', function() f.Option1:Width(110); f.Option1:ClearAllPoints(); f.Option1:Point('BOTTOMRIGHT', f, 'BOTTOM', -4, 45) end)
f.Option2:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:Point('BOTTOM', 0, 45) end)
S:HandleButton(f.Option2, true)
f.Option3 = CreateFrame('Button', 'InstallOption3Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option3:Size(100, 30)
f.Option3:SetPoint('LEFT', f.Option2, 'RIGHT', 4, 0)
f.Option3:Point('LEFT', f.Option2, 'RIGHT', 4, 0)
f.Option3:SetText('')
f.Option3:Hide()
f.Option3:SetScript('OnShow', function() f.Option1:Width(100); f.Option1:ClearAllPoints(); f.Option1:SetPoint('RIGHT', f.Option2, 'LEFT', -4, 0); f.Option2:Width(100); f.Option2:ClearAllPoints(); f.Option2:SetPoint('BOTTOM', f, 'BOTTOM', 0, 45) end)
f.Option3:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOM', 0, 45); f.Option2:Width(110); f.Option2:ClearAllPoints(); f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45) end)
f.Option3:SetScript('OnShow', function() f.Option1:Width(100); f.Option1:ClearAllPoints(); f.Option1:Point('RIGHT', f.Option2, 'LEFT', -4, 0); f.Option2:Width(100); f.Option2:ClearAllPoints(); f.Option2:Point('BOTTOM', f, 'BOTTOM', 0, 45) end)
f.Option3:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:Point('BOTTOM', 0, 45); f.Option2:Width(110); f.Option2:ClearAllPoints(); f.Option2:Point('BOTTOMLEFT', f, 'BOTTOM', 4, 45) end)
S:HandleButton(f.Option3, true)
f.Option4 = CreateFrame('Button', 'InstallOption4Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option4:Size(100, 30)
f.Option4:SetPoint('LEFT', f.Option3, 'RIGHT', 4, 0)
f.Option4:Point('LEFT', f.Option3, 'RIGHT', 4, 0)
f.Option4:SetText('')
f.Option4:Hide()
f.Option4:SetScript('OnShow', function()
f.Option1:Width(100)
f.Option2:Width(100)
f.Option1:ClearAllPoints()
f.Option1:SetPoint('RIGHT', f.Option2, 'LEFT', -4, 0)
f.Option1:Point('RIGHT', f.Option2, 'LEFT', -4, 0)
f.Option2:ClearAllPoints()
f.Option2:SetPoint('BOTTOMRIGHT', f, 'BOTTOM', -4, 45)
f.Option2:Point('BOTTOMRIGHT', f, 'BOTTOM', -4, 45)
end)
f.Option4:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOM', 0, 45); f.Option2:Width(110); f.Option2:ClearAllPoints(); f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45) end)
f.Option4:SetScript('OnHide', function() f.Option1:Width(160); f.Option1:ClearAllPoints(); f.Option1:Point('BOTTOM', 0, 45); f.Option2:Width(110); f.Option2:ClearAllPoints(); f.Option2:Point('BOTTOMLEFT', f, 'BOTTOM', 4, 45) end)
S:HandleButton(f.Option4, true)
f.SubTitle = f:CreateFontString(nil, 'OVERLAY')
f.SubTitle:FontTemplate(nil, 15, nil)
f.SubTitle:SetPoint('TOP', 0, -40)
f.SubTitle:Point('TOP', 0, -40)
f.Desc1 = f:CreateFontString(nil, 'OVERLAY')
f.Desc1:FontTemplate()
f.Desc1:SetPoint('TOPLEFT', 20, -75)
f.Desc1:Point('TOPLEFT', 20, -75)
f.Desc1:Width(f:GetWidth() - 40)
f.Desc2 = f:CreateFontString(nil, 'OVERLAY')
f.Desc2:FontTemplate()
f.Desc2:SetPoint('TOPLEFT', 20, -125)
f.Desc2:Point('TOPLEFT', 20, -125)
f.Desc2:Width(f:GetWidth() - 40)
f.Desc3 = f:CreateFontString(nil, 'OVERLAY')
f.Desc3:FontTemplate()
f.Desc3:SetPoint('TOPLEFT', 20, -175)
f.Desc3:Point('TOPLEFT', 20, -175)
f.Desc3:Width(f:GetWidth() - 40)
local close = CreateFrame('Button', 'InstallCloseButton', f, 'UIPanelCloseButton, BackdropTemplate')
close:SetPoint('TOPRIGHT', f, 'TOPRIGHT')
close:Point('TOPRIGHT', f, 'TOPRIGHT')
close:SetScript('OnClick', function() f:Hide() end)
S:HandleCloseButton(close)
local logo = f:CreateTexture('InstallTutorialImage', 'OVERLAY')
logo:Size(256, 128)
logo:SetTexture(E.Media.Textures.LogoTop)
logo:SetPoint('BOTTOM', 0, 70)
logo:Point('BOTTOM', 0, 70)
f.tutorialImage = logo
local logo2 = f:CreateTexture('InstallTutorialImage2', 'OVERLAY')
logo2:Size(256, 128)
logo2:SetTexture(E.Media.Textures.LogoBottom)
logo2:SetPoint('BOTTOM', 0, 70)
logo2:Point('BOTTOM', 0, 70)
f.tutorialImage2 = logo2
end
......
......@@ -52,7 +52,7 @@ local function UpdateCoords(self)
local nudgeFrame = _G.ElvUIMoverNudgeWindow
nudgeFrame:ClearAllPoints()
nudgeFrame:SetPoint(nudgePoint, mover, nudgeInversePoint, coordX, coordY)
nudgeFrame:Point(nudgePoint, mover, nudgeInversePoint, coordX, coordY)
E:UpdateNudgeFrame(mover, x, y)
end
......@@ -68,12 +68,12 @@ function E:SetMoverPoints(name, parent)
if point2 then
holder.mover:ClearAllPoints()
holder.mover:SetPoint(point2, relativeTo2, relativePoint2, xOffset2, yOffset2)
holder.mover:Point(point2, relativeTo2, relativePoint2, xOffset2, yOffset2)
end
if parent then
parent:ClearAllPoints()
parent:SetPoint(point1, parent.mover, 0, 0)
parent:Point(point1, parent.mover, 0, 0)
end
end
......@@ -125,7 +125,7 @@ local function OnDragStop(self)
local x2, y2, p2 = E:CalculateMoverPoints(self)
self:ClearAllPoints()
self:SetPoint(p2, E.UIParent, p2, x2, y2)
self:Point(p2, E.UIParent, p2, x2, y2)
E:SaveMoverPosition(self.name)
......@@ -236,7 +236,7 @@ local function UpdateMover(name, parent, textString, overlay, snapOffset, postdr
f:EnableMouseWheel(true)
f:SetMovable(true)
f:SetTemplate('Transparent', nil, nil, true)
f:SetSize(parent:GetSize())
f:Size(parent:GetSize())
f:Hide()
local fs = f:CreateFontString(nil, 'OVERLAY')
......@@ -445,7 +445,7 @@ function E:ResetMovers(arg)
local frame = holder.mover
if point then
frame:ClearAllPoints()
frame:SetPoint(point, anchor, secondaryPoint, x, y)
frame:Point(point, anchor, secondaryPoint, x, y)
end
HandlePostDrag(frame)
......
......@@ -155,7 +155,7 @@ end
function PI:CreateStepComplete()
local imsg = CreateFrame('Frame', 'PluginInstallStepComplete', E.UIParent)
imsg:Size(418, 72)
imsg:SetPoint('TOP', 0, -190)
imsg:Point('TOP', 0, -190)
imsg:Hide()
imsg:SetScript('OnShow', function(frame)
if frame.message then
......@@ -173,7 +173,7 @@ function PI:CreateStepComplete()
imsg.bg = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.bg:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.bg:SetPoint('BOTTOM')
imsg.bg:Point('BOTTOM')
imsg.bg:Size(326, 103)
imsg.bg:SetTexCoord(0.00195313, 0.63867188, 0.03710938, 0.23828125)
imsg.bg:SetVertexColor(1, 1, 1, 0.6)
......@@ -181,19 +181,19 @@ function PI:CreateStepComplete()
imsg.lineTop = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.lineTop:SetDrawLayer('BACKGROUND', 2)
imsg.lineTop:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.lineTop:SetPoint('TOP')
imsg.lineTop:Point('TOP')
imsg.lineTop:Size(418, 7)