Commit 6d2a9bf2 authored by Simpy's avatar Simpy 🐹
Browse files

Revert "massive commit"

This reverts commit a5667858, reversing
changes made to b63f3214.

# Conflicts:
#	ElvUI/Core/Config.lua
#	ElvUI/Modules/ActionBars/ActionBars.lua
#	ElvUI/Modules/ActionBars/Bind.lua
#	ElvUI/Modules/ActionBars/PetBar.lua
#	ElvUI/Modules/Blizzard/AlertFrame.lua
#	ElvUI/Modules/Blizzard/AltPower.lua
#	ElvUI/Modules/Blizzard/ColorPicker.lua
#	ElvUI/Modules/Blizzard/Durability.lua
#	ElvUI/Modules/Blizzard/LevelUpBossBanner.lua
#	ElvUI/Modules/Blizzard/Vehicle.lua
#	ElvUI/Modules/Blizzard/WidgetsUI.lua
#	ElvUI/Modules/Chat/Chat.lua
#	ElvUI/Modules/Maps/Minimap.lua
#	ElvUI/Modules/Misc/ChatBubbles.lua
#	ElvUI/Modules/Misc/DebugTools.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/Plugins.lua
#	ElvUI/Modules/Nameplates/Nameplates.lua
#	ElvUI/Modules/Skins/Blizzard/Achievement.lua
#	ElvUI/Modules/Skins/Blizzard/AzeriteRespec.lua
#	ElvUI/Modules/Skins/Blizzard/BlizzardOptions.lua
#	ElvUI/Modules/Skins/Blizzard/Calendar.lua
#	ElvUI/Modules/Skins/Blizzard/Character.lua
#	ElvUI/Modules/Skins/Blizzard/Communities.lua
#	ElvUI/Modules/Skins/Blizzard/EncounterJournal.lua
#	ElvUI/Modules/Skins/Blizzard/Friends.lua
#	ElvUI/Modules/Skins/Blizzard/Garrison.lua
#	ElvUI/Modules/Skins/Blizzard/Gossip.lua
#	ElvUI/Modules/Skins/Blizzard/Guild.lua
#	ElvUI/Modules/Skins/Blizzard/Inspect.lua
#	ElvUI/Modules/Skins/Blizzard/LFG.lua
#	ElvUI/Modules/Skins/Blizzard/Loot.lua
#	ElvUI/Modules/Skins/Blizzard/Macro.lua
#	ElvUI/Modules/Skins/Blizzard/Mail.lua
#	ElvUI/Modules/Skins/Blizzard/Misc.lua
#	ElvUI/Modules/Skins/Blizzard/ObjectiveTracker.lua
#	ElvUI/Modules/Skins/Blizzard/Orderhall.lua
#	ElvUI/Modules/Skins/Blizzard/PVP.lua
#	ElvUI/Modules/Skins/Blizzard/PetBattle.lua
#	ElvUI/Modules/Skins/Blizzard/Quest.lua
#	ElvUI/Modules/Skins/Blizzard/Stable.lua
#	ElvUI/Modules/Skins/Blizzard/Talent.lua
#	ElvUI/Modules/Skins/Blizzard/TalkingHead.lua
#	ElvUI/Modules/Skins/Blizzard/Tooltip.lua
#	ElvUI/Modules/Skins/Blizzard/TradeSkill.lua
#	ElvUI/Modules/Skins/Blizzard/Trainer.lua
#	ElvUI/Modules/Skins/Skins.lua
#	ElvUI/Modules/UnitFrames/Elements/AuraBars.lua
#	ElvUI/Modules/UnitFrames/Elements/CastBar.lua
#	ElvUI/Modules/UnitFrames/Elements/CombatIndicator.lua
#	ElvUI/Modules/UnitFrames/Elements/HealPrediction.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/RoleIcons.lua
parent 0cce0a10
......@@ -266,7 +266,7 @@ do
return
end
local helloKittyLeft = CreateFrame('Frame', 'HelloKittyLeft', _G.UIParent)
helloKittyLeft:SetSize(120, 128)
helloKittyLeft:Size(120, 128)
helloKittyLeft:SetMovable(true)
helloKittyLeft:EnableMouse(true)
helloKittyLeft:RegisterForDrag('LeftButton')
......@@ -283,7 +283,7 @@ do
helloKittyLeft:SetScript('OnUpdate', OnUpdate)
local helloKittyRight = CreateFrame('Frame', 'HelloKittyRight', _G.UIParent)
helloKittyRight:SetSize(120, 128)
helloKittyRight:Size(120, 128)
helloKittyRight:SetMovable(true)
helloKittyRight:EnableMouse(true)
helloKittyRight:RegisterForDrag('LeftButton')
......
......@@ -143,7 +143,7 @@ function E:Grid_Create()
grid.boxSize = gSize
grid:SetPoint('CENTER', E.UIParent)
grid:SetSize(width, height)
grid:Size(width, height)
grid:Show()
for i = 0, gSize do
......@@ -266,7 +266,7 @@ function E:CreateMoverPopup()
f:SetMovable(true)
f:SetFrameLevel(99)
f:SetClampedToScreen(true)
f:SetSize(370, 190)
f:Size(370, 190)
f:SetTemplate('Transparent')
f:SetPoint('BOTTOM', _G.UIParent, 'CENTER', 0, 100)
f:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
......@@ -276,7 +276,7 @@ function E:CreateMoverPopup()
local header = CreateFrame('Button', nil, f, 'BackdropTemplate')
header:SetTemplate(nil, true)
header:SetSize(100, 25)
header:Size(100, 25)
header:SetPoint('CENTER', f, 'TOP')
header:SetFrameLevel(header:GetFrameLevel() + 2)
header:EnableMouse(true)
......@@ -320,7 +320,7 @@ function E:CreateMoverPopup()
end)
local align = CreateFrame('EditBox', f:GetName()..'EditBox', f, 'InputBoxTemplate, BackdropTemplate')
align:SetSize(24, 17)
align:Size(24, 17)
align:SetAutoFocus(false)
align:SetScript('OnEscapePressed', function(eb)
eb:SetText(E.db.gridSize)
......@@ -382,7 +382,7 @@ function E:CreateMoverPopup()
local nudgeFrame = CreateFrame('Frame', 'ElvUIMoverNudgeWindow', E.UIParent, 'BackdropTemplate')
nudgeFrame:SetFrameStrata('DIALOG')
nudgeFrame:SetSize(200, 110)
nudgeFrame:Size(200, 110)
nudgeFrame:SetTemplate('Transparent')
nudgeFrame:CreateShadow(5)
nudgeFrame:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
......@@ -417,7 +417,7 @@ function E:CreateMoverPopup()
header = CreateFrame('Button', nil, nudgeFrame, 'BackdropTemplate')
header:SetTemplate(nil, true)
header:SetSize(100, 25)
header:Size(100, 25)
header:SetPoint('CENTER', nudgeFrame, 'TOP')
header:SetFrameLevel(header:GetFrameLevel() + 2)
header:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
......@@ -431,7 +431,7 @@ function E:CreateMoverPopup()
nudgeFrame.title = title
local xOffset = CreateFrame('EditBox', nudgeFrame:GetName()..'XEditBox', nudgeFrame, 'InputBoxTemplate')
xOffset:SetSize(50, 17)
xOffset:Size(50, 17)
xOffset:SetAutoFocus(false)
xOffset.currentValue = 0
xOffset:SetScript('OnEscapePressed', function(eb)
......@@ -465,7 +465,7 @@ function E:CreateMoverPopup()
nudgeFrame.xOffset = xOffset
local yOffset = CreateFrame('EditBox', nudgeFrame:GetName()..'YEditBox', nudgeFrame, 'InputBoxTemplate')
yOffset:SetSize(50, 17)
yOffset:Size(50, 17)
yOffset:SetAutoFocus(false)
yOffset.currentValue = 0
yOffset:SetScript('OnEscapePressed', function(eb)
......@@ -501,7 +501,7 @@ function E:CreateMoverPopup()
local resetButton = CreateFrame('Button', nudgeFrame:GetName()..'ResetButton', nudgeFrame, 'UIPanelButtonTemplate, BackdropTemplate')
resetButton:SetText(RESET)
resetButton:SetPoint('TOP', nudgeFrame, 'CENTER', 0, 2)
resetButton:SetSize(100, 25)
resetButton:Size(100, 25)
resetButton:SetScript('OnClick', function()
if ElvUIMoverNudgeWindow.child.textString then
E:ResetMovers(ElvUIMoverNudgeWindow.child.textString)
......@@ -515,7 +515,7 @@ function E:CreateMoverPopup()
upButton:SetScript('OnClick', function() E:NudgeMover(nil, 1) end)
S:HandleNextPrevButton(upButton)
S:HandleButton(upButton)
upButton:SetSize(22, 22)
upButton:Size(22)
nudgeFrame.upButton = upButton
local downButton = CreateFrame('Button', nudgeFrame:GetName()..'DownButton', nudgeFrame, 'BackdropTemplate')
......@@ -523,7 +523,7 @@ function E:CreateMoverPopup()
downButton:SetScript('OnClick', function() E:NudgeMover(nil, -1) end)
S:HandleNextPrevButton(downButton)
S:HandleButton(downButton)
downButton:SetSize(22, 22)
downButton:Size(22)
nudgeFrame.downButton = downButton
local leftButton = CreateFrame('Button', nudgeFrame:GetName()..'LeftButton', nudgeFrame, 'BackdropTemplate')
......@@ -531,7 +531,7 @@ function E:CreateMoverPopup()
leftButton:SetScript('OnClick', function() E:NudgeMover(-1) end)
S:HandleNextPrevButton(leftButton)
S:HandleButton(leftButton)
leftButton:SetSize(22, 22)
leftButton:Size(22)
nudgeFrame.leftButton = leftButton
local rightButton = CreateFrame('Button', nudgeFrame:GetName()..'RightButton', nudgeFrame, 'BackdropTemplate')
......@@ -539,7 +539,7 @@ function E:CreateMoverPopup()
rightButton:SetScript('OnClick', function() E:NudgeMover(1) end)
S:HandleNextPrevButton(rightButton)
S:HandleButton(rightButton)
rightButton:SetSize(22, 22)
rightButton:Size(22)
nudgeFrame.rightButton = rightButton
end
......@@ -668,7 +668,7 @@ function E:Config_CreateSeparatorLine(frame, lastButton)
local line = frame.leftHolder.buttons:CreateTexture()
line:SetTexture(E.Media.Textures.White8x8)
line:SetVertexColor(1, .82, 0, .4)
line:SetSize(179, 2)
line:Size(179, 2)
line:SetPoint('TOP', lastButton, 'BOTTOM', 0, -6)
line.separator = true
return line
......@@ -714,7 +714,7 @@ function E:Config_CreateButton(info, frame, unskinned, ...)
btn:HookScript('OnEnter', Config_ButtonOnEnter)
btn:HookScript('OnLeave', Config_ButtonOnLeave)
btn:SetScript('OnClick', info.func)
btn:SetWidth(btn:GetTextWidth() + 40)
btn:Width(btn:GetTextWidth() + 40)
return btn
end
......@@ -831,7 +831,7 @@ function E:Config_CreateLeftButtons(frame, unskinned, options)
end
local btn = E:Config_CreateButton(info, frame, unskinned, 'Button', nil, buttons, 'UIPanelButtonTemplate, BackdropTemplate')
btn:SetWidth(177)
btn:Width(177)
if not last then
btn:SetPoint('TOP', buttons, 'TOP', 0, 0)
......@@ -1143,56 +1143,56 @@ function E:ToggleOptionsUI(msg)
end
local bottom = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
bottom:SetPoint('BOTTOMLEFT', 2, 2)
bottom:SetPoint('BOTTOMRIGHT', -2, 2)
bottom:SetHeight(37)
bottom:Point('BOTTOMLEFT', 2, 2)
bottom:Point('BOTTOMRIGHT', -2, 2)
bottom:Height(37)
frame.bottomHolder = bottom
local close = CreateFrame('Button', nil, frame, 'UIPanelCloseButton, BackdropTemplate')
close:SetScript('OnClick', E.Config_CloseClicked)
close:SetFrameLevel(1000)
close:SetPoint('TOPRIGHT', unskinned and -8 or 1, unskinned and -8 or 2)
close:SetSize(32, 32)
close:Point('TOPRIGHT', unskinned and -8 or 1, unskinned and -8 or 2)
close:Size(32, 32)
close.originalClose = frame.originalClose
frame.closeButton = close
local left = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
left:SetPoint('BOTTOMRIGHT', bottom, 'BOTTOMLEFT', 181, 0)
left:SetPoint('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
left:SetPoint('TOPLEFT', unskinned and 10 or 2, unskinned and -6 or -2)
left:Point('BOTTOMRIGHT', bottom, 'BOTTOMLEFT', 181, 0)
left:Point('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
left:Point('TOPLEFT', unskinned and 10 or 2, unskinned and -6 or -2)
frame.leftHolder = left
local top = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
top.version = frame.obj.titletext
top:SetPoint('TOPRIGHT', frame, -2, 0)
top:SetPoint('TOPLEFT', left, 'TOPRIGHT', 1, 0)
top:SetHeight(24)
top:Point('TOPRIGHT', frame, -2, 0)
top:Point('TOPLEFT', left, 'TOPRIGHT', 1, 0)
top:Height(24)
frame.topHolder = top
local LogoBottom = left:CreateTexture()
LogoBottom:SetTexture(E.Media.Textures.LogoBottomSmall)
LogoBottom:SetPoint('CENTER', left, 'TOP', unskinned and 10 or 0, unskinned and -40 or -36)
LogoBottom:SetSize(128, 64)
LogoBottom:Point('CENTER', left, 'TOP', unskinned and 10 or 0, unskinned and -40 or -36)
LogoBottom:Size(128, 64)
left.LogoBottom = LogoBottom
local LogoTop = left:CreateTexture()
LogoTop:SetTexture(E.Media.Textures.LogoTopSmall)
LogoTop:SetPoint('CENTER', left, 'TOP', unskinned and 10 or 0, unskinned and -40 or -36)
LogoTop:SetSize(128, 64)
LogoTop:Point('CENTER', left, 'TOP', unskinned and 10 or 0, unskinned and -40 or -36)
LogoTop:Size(128, 64)
left.LogoTop = LogoTop
local buttonsHolder = CreateFrame('Frame', nil, left)
buttonsHolder:SetPoint('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
buttonsHolder:SetPoint('TOPLEFT', left, 'TOPLEFT', 0, -70)
buttonsHolder:SetPoint('BOTTOMRIGHT')
buttonsHolder:Point('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
buttonsHolder:Point('TOPLEFT', left, 'TOPLEFT', 0, -70)
buttonsHolder:Point('BOTTOMRIGHT')
buttonsHolder:SetFrameLevel(5)
buttonsHolder:SetClipsChildren(true)
left.buttonsHolder = buttonsHolder
local buttons = CreateFrame('Frame', nil, buttonsHolder, 'BackdropTemplate')
buttons:SetPoint('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
buttons:SetPoint('BOTTOMRIGHT')
buttons:SetPoint('TOPLEFT', 0, 0)
buttons:Point('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
buttons:Point('BOTTOMRIGHT')
buttons:Point('TOPLEFT', 0, 0)
left.buttons = buttons
local slider = CreateFrame('Slider', nil, frame, 'BackdropTemplate')
......@@ -1204,16 +1204,16 @@ function E:ToggleOptionsUI(msg)
slider:SetFrameLevel(4)
slider:SetValueStep(1)
slider:SetValue(0)
slider:SetWidth(192)
slider:SetPoint('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
slider:SetPoint('TOPLEFT', buttons, 'TOPLEFT', 0, 0)
slider:Width(192)
slider:Point('BOTTOMLEFT', bottom, 'TOPLEFT', 0, 1)
slider:Point('TOPLEFT', buttons, 'TOPLEFT', 0, 0)
slider.buttons = buttons
left.slider = slider
local thumb = slider:GetThumbTexture()
thumb:SetPoint('LEFT', left, 'RIGHT', 2, 0)
thumb:Point('LEFT', left, 'RIGHT', 2, 0)
thumb:SetVertexColor(1, 1, 1, 0.5)
thumb:SetSize(8, 12)
thumb:Size(8, 12)
left.slider.thumb = thumb
if not unskinned then
......
......@@ -35,7 +35,7 @@ function D:Initialize()
self.statusBar:CreateBackdrop()
self.statusBar:SetStatusBarTexture(E.media.normTex)
self.statusBar:SetStatusBarColor(0.95, 0.15, 0.15)
self.statusBar:SetSize(250, 18)
self.statusBar:Size(250, 18)
self.statusBar.text = self.statusBar:CreateFontString(nil, 'OVERLAY')
self.statusBar.text:FontTemplate()
self.statusBar.text:SetPoint('CENTER')
......
......@@ -59,8 +59,8 @@ function E:DropDown(list, frame, xOffset, yOffset)
end
frame.buttons[i]:Show()
frame.buttons[i]:SetHeight(BUTTON_HEIGHT)
frame.buttons[i]:SetWidth(BUTTON_WIDTH)
frame.buttons[i]:Height(BUTTON_HEIGHT)
frame.buttons[i]:Width(BUTTON_WIDTH)
frame.buttons[i].text:SetText(list[i].text)
frame.buttons[i].func = list[i].func
frame.buttons[i]:SetScript('OnClick', OnClick)
......@@ -72,8 +72,8 @@ function E:DropDown(list, frame, xOffset, yOffset)
end
end
frame:SetHeight((#list * BUTTON_HEIGHT) + PADDING * 2)
frame:SetWidth(BUTTON_WIDTH + PADDING * 2)
frame:Height((#list * BUTTON_HEIGHT) + PADDING * 2)
frame:Width(BUTTON_WIDTH + PADDING * 2)
local UIScale = _G.UIParent:GetScale()
local x, y = GetCursorPosition()
......
......@@ -499,7 +499,7 @@ local function ResetAll()
ElvUIInstallFrame.Desc1:SetText('')
ElvUIInstallFrame.Desc2:SetText('')
ElvUIInstallFrame.Desc3:SetText('')
ElvUIInstallFrame:SetSize(550, 400)
ElvUIInstallFrame:Size(550, 400)
end
function E:SetPage(PageNum)
......@@ -656,7 +656,7 @@ function E:SetPage(PageNum)
InstallOption2Button:Show()
InstallOption2Button:SetScript('OnClick', InstallComplete)
InstallOption2Button:SetText(L["Finished"])
ElvUIInstallFrame:SetSize(550, 350)
ElvUIInstallFrame:Size(550, 350)
end
end
......@@ -678,7 +678,7 @@ end
function E:Install()
if not _G.InstallStepComplete then
local imsg = CreateFrame('Frame', 'InstallStepComplete', E.UIParent)
imsg:SetSize(418, 72)
imsg:Size(418, 72)
imsg:SetPoint('TOP', 0, -190)
imsg:Hide()
imsg:SetScript('OnShow', function(f)
......@@ -698,7 +698,7 @@ function E:Install()
imsg.bg = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.bg:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.bg:SetPoint('BOTTOM')
imsg.bg:SetSize(326, 103)
imsg.bg:Size(326, 103)
imsg.bg:SetTexCoord(0.00195313, 0.63867188, 0.03710938, 0.23828125)
imsg.bg:SetVertexColor(1, 1, 1, 0.6)
......@@ -706,14 +706,14 @@ function E:Install()
imsg.lineTop:SetDrawLayer('BACKGROUND', 2)
imsg.lineTop:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.lineTop:SetPoint('TOP')
imsg.lineTop:SetSize(418, 7)
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:SetSize(418, 7)
imsg.lineBottom:Size(418, 7)
imsg.lineBottom:SetTexCoord(0.00195313, 0.81835938, 0.01953125, 0.03320313)
imsg.text = imsg:CreateFontString(nil, 'ARTWORK', 'GameFont_Gigantic')
......@@ -726,7 +726,7 @@ function E:Install()
if not ElvUIInstallFrame then
local f = CreateFrame('Button', 'ElvUIInstallFrame', E.UIParent, 'BackdropTemplate')
f.SetPage = E.SetPage
f:SetSize(550, 400)
f:Size(550, 400)
f:SetTemplate('Transparent')
f:SetPoint('CENTER')
f:SetFrameStrata('TOOLTIP')
......@@ -743,7 +743,7 @@ function E:Install()
f.Title:SetText(L["ElvUI Installation"])
f.Next = CreateFrame('Button', 'InstallNextButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Next:SetSize(110, 25)
f.Next:Size(110, 25)
f.Next:SetPoint('BOTTOMRIGHT', -5, 5)
f.Next:SetText(CONTINUE)
f.Next:Disable()
......@@ -751,7 +751,7 @@ function E:Install()
S:HandleButton(f.Next, true)
f.Prev = CreateFrame('Button', 'InstallPrevButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Prev:SetSize(110, 25)
f.Prev:Size(110, 25)
f.Prev:SetPoint('BOTTOMLEFT', 5, 5)
f.Prev:SetText(PREVIOUS)
f.Prev:Disable()
......@@ -781,8 +781,8 @@ function E:Install()
f.Slider = CreateFrame('Slider', 'InstallSlider', f, 'BackdropTemplate')
f.Slider:SetOrientation('HORIZONTAL')
f.Slider:SetHeight(15)
f.Slider:SetWidth(400)
f.Slider:Height(15)
f.Slider:Width(400)
f.Slider:SetHitRectInsets(0, 0, -10, 0)
f.Slider:SetPoint('CENTER', 0, 45)
S:HandleSliderFrame(f.Slider)
......@@ -797,44 +797,44 @@ function E:Install()
f.Slider.Cur:FontTemplate(nil, 30, nil)
f.Option1 = CreateFrame('Button', 'InstallOption1Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option1:SetSize(160, 30)
f.Option1:Size(160, 30)
f.Option1:SetPoint('BOTTOM', 0, 45)
f.Option1:SetText('')
f.Option1:Hide()
S:HandleButton(f.Option1, true)
f.Option2 = CreateFrame('Button', 'InstallOption2Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option2:SetSize(110, 30)
f.Option2:Size(110, 30)
f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45)
f.Option2:SetText('')
f.Option2:Hide()
f.Option2:SetScript('OnShow', function() f.Option1:SetWidth(110); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOMRIGHT', f, 'BOTTOM', -4, 45) end)
f.Option2:SetScript('OnHide', function() f.Option1:SetWidth(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: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)
S:HandleButton(f.Option2, true)
f.Option3 = CreateFrame('Button', 'InstallOption3Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option3:SetSize(100, 30)
f.Option3:Size(100, 30)
f.Option3:SetPoint('LEFT', f.Option2, 'RIGHT', 4, 0)
f.Option3:SetText('')
f.Option3:Hide()
f.Option3:SetScript('OnShow', function() f.Option1:SetWidth(100); f.Option1:ClearAllPoints(); f.Option1:SetPoint('RIGHT', f.Option2, 'LEFT', -4, 0); f.Option2:SetWidth(100); f.Option2:ClearAllPoints(); f.Option2:SetPoint('BOTTOM', f, 'BOTTOM', 0, 45) end)
f.Option3:SetScript('OnHide', function() f.Option1:SetWidth(160); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOM', 0, 45); f.Option2:SetWidth(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: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)
S:HandleButton(f.Option3, true)
f.Option4 = CreateFrame('Button', 'InstallOption4Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option4:SetSize(100, 30)
f.Option4:Size(100, 30)
f.Option4:SetPoint('LEFT', f.Option3, 'RIGHT', 4, 0)
f.Option4:SetText('')
f.Option4:Hide()
f.Option4:SetScript('OnShow', function()
f.Option1:SetWidth(100)
f.Option2:SetWidth(100)
f.Option1:Width(100)
f.Option2:Width(100)
f.Option1:ClearAllPoints()
f.Option1:SetPoint('RIGHT', f.Option2, 'LEFT', -4, 0)
f.Option2:ClearAllPoints()
f.Option2:SetPoint('BOTTOMRIGHT', f, 'BOTTOM', -4, 45)
end)
f.Option4:SetScript('OnHide', function() f.Option1:SetWidth(160); f.Option1:ClearAllPoints(); f.Option1:SetPoint('BOTTOM', 0, 45); f.Option2:SetWidth(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:SetPoint('BOTTOM', 0, 45); f.Option2:Width(110); f.Option2:ClearAllPoints(); f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45) end)
S:HandleButton(f.Option4, true)
f.SubTitle = f:CreateFontString(nil, 'OVERLAY')
......@@ -844,17 +844,17 @@ function E:Install()
f.Desc1 = f:CreateFontString(nil, 'OVERLAY')
f.Desc1:FontTemplate()
f.Desc1:SetPoint('TOPLEFT', 20, -75)
f.Desc1:SetWidth(f:GetWidth() - 40)
f.Desc1:Width(f:GetWidth() - 40)
f.Desc2 = f:CreateFontString(nil, 'OVERLAY')
f.Desc2:FontTemplate()
f.Desc2:SetPoint('TOPLEFT', 20, -125)
f.Desc2:SetWidth(f:GetWidth() - 40)
f.Desc2:Width(f:GetWidth() - 40)
f.Desc3 = f:CreateFontString(nil, 'OVERLAY')
f.Desc3:FontTemplate()
f.Desc3:SetPoint('TOPLEFT', 20, -175)
f.Desc3:SetWidth(f:GetWidth() - 40)
f.Desc3:Width(f:GetWidth() - 40)
local close = CreateFrame('Button', 'InstallCloseButton', f, 'UIPanelCloseButton, BackdropTemplate')
close:SetPoint('TOPRIGHT', f, 'TOPRIGHT')
......@@ -862,13 +862,13 @@ function E:Install()
S:HandleCloseButton(close)
local logo = f:CreateTexture('InstallTutorialImage', 'OVERLAY')
logo:SetSize(256, 128)
logo:Size(256, 128)
logo:SetTexture(E.Media.Textures.LogoTop)
logo:SetPoint('BOTTOM', 0, 70)
f.tutorialImage = logo
local logo2 = f:CreateTexture('InstallTutorialImage2', 'OVERLAY')
logo2:SetSize(256, 128)
logo2:Size(256, 128)
logo2:SetTexture(E.Media.Textures.LogoBottom)
logo2:SetPoint('BOTTOM', 0, 70)
f.tutorialImage2 = logo2
......
......@@ -94,7 +94,7 @@ local function ResetAll()
f.Desc2:SetText('')
f.Desc3:SetText('')
f.Desc4:SetText('')
f:SetSize(550, 400)
f:Size(550, 400)
if f.StepTitles then
for i = 1, #f.side.Lines do f.side.Lines[i].text:SetText('') end
end
......@@ -154,7 +154,7 @@ end
function PI:CreateStepComplete()
local imsg = CreateFrame('Frame', 'PluginInstallStepComplete', E.UIParent)
imsg:SetSize(418, 72)
imsg:Size(418, 72)
imsg:SetPoint('TOP', 0, -190)
imsg:Hide()
imsg:SetScript('OnShow', function(frame)
......@@ -174,7 +174,7 @@ function PI:CreateStepComplete()
imsg.bg = imsg:CreateTexture(nil, 'BACKGROUND')
imsg.bg:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.bg:SetPoint('BOTTOM')
imsg.bg:SetSize(326, 103)
imsg.bg:Size(326, 103)
imsg.bg:SetTexCoord(0.00195313, 0.63867188, 0.03710938, 0.23828125)
imsg.bg:SetVertexColor(1, 1, 1, 0.6)
......@@ -182,14 +182,14 @@ function PI:CreateStepComplete()
imsg.lineTop:SetDrawLayer('BACKGROUND', 2)
imsg.lineTop:SetTexture([[Interface\LevelUp\LevelUpTex]])
imsg.lineTop:SetPoint('TOP')
imsg.lineTop:SetSize(418, 7)
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:SetSize(418, 7)
imsg.lineBottom:Size(418, 7)
imsg.lineBottom:SetTexCoord(0.00195313, 0.81835938, 0.01953125, 0.03320313)
imsg.text = imsg:CreateFontString(nil, 'ARTWORK', 'GameFont_Gigantic')
......@@ -201,14 +201,14 @@ end
function PI:CreateFrame()
f = CreateFrame('Button', 'PluginInstallFrame', E.UIParent, 'BackdropTemplate')
f.SetPage = SetPage
f:SetSize(550, 400)
f:Size(550, 400)
f:SetTemplate('Transparent')
f:SetPoint('CENTER')
f:SetFrameStrata('TOOLTIP')
f:SetMovable(true)
f.MoveFrame = CreateFrame('Frame', nil, f, 'TitleDragAreaTemplate')
f.MoveFrame:SetSize(450, 50)
f.MoveFrame:Size(450, 50)
f.MoveFrame:SetPoint('TOP', f, 'TOP')
f.Title = f:CreateFontString(nil, 'OVERLAY')
......@@ -216,7 +216,7 @@ function PI:CreateFrame()
f.Title:SetPoint('TOP', 0, -5)
f.Next = CreateFrame('Button', 'PluginInstallNextButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Next:SetSize(110, 25)
f.Next:Size(110, 25)
f.Next:SetPoint('BOTTOMRIGHT', -5, 5)
f.Next:SetText(CONTINUE)
f.Next:Disable()
......@@ -224,7 +224,7 @@ function PI:CreateFrame()
S:HandleButton(f.Next)
f.Prev = CreateFrame('Button', 'PluginInstallPrevButton', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Prev:SetSize(110, 25)
f.Prev:Size(110, 25)
f.Prev:SetPoint('BOTTOMLEFT', 5, 5)
f.Prev:SetText(PREVIOUS)
f.Prev:Disable()
......@@ -249,14 +249,14 @@ function PI:CreateFrame()
f.Status.text:SetPoint('CENTER')
f.Option1 = CreateFrame('Button', 'PluginInstallOption1Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option1:SetSize(160, 30)
f.Option1:Size(160, 30)
f.Option1:SetPoint('BOTTOM', 0, 45)
f.Option1:SetText('')
f.Option1:Hide()
S:HandleButton(f.Option1)
f.Option2 = CreateFrame('Button', 'PluginInstallOption2Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option2:SetSize(110, 30)
f.Option2:Size(110, 30)
f.Option2:SetPoint('BOTTOMLEFT', f, 'BOTTOM', 4, 45)
f.Option2:SetText('')
f.Option2:Hide()
......@@ -265,7 +265,7 @@ function PI:CreateFrame()
S:HandleButton(f.Option2)
f.Option3 = CreateFrame('Button', 'PluginInstallOption3Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option3:SetSize(100, 30)
f.Option3:Size(100, 30)
f.Option3:SetPoint('LEFT', f.Option2, 'RIGHT', 4, 0)
f.Option3:SetText('')
f.Option3:Hide()
......@@ -274,13 +274,13 @@ function PI:CreateFrame()
S:HandleButton(f.Option3)
f.Option4 = CreateFrame('Button', 'PluginInstallOption4Button', f, 'UIPanelButtonTemplate, BackdropTemplate')
f.Option4:SetSize(100, 30)
f.Option4:Size(100, 30)
f.Option4:SetPoint('LEFT', f.Option3, 'RIGHT', 4, 0)
f.Option4:SetText('')
f.Option4:Hide()
f.Option4:SetScript('OnShow', function()
f.Option1:SetWidth(100)
f.Option2:SetWidth(100)