Commit 966a7016 authored by Simpy's avatar Simpy 🐹

12.00

parents 3b6bfede 3ea99068
......@@ -30,7 +30,6 @@ local UnitIsMercenary = UnitIsMercenary
local UnitStat = UnitStat
local C_PetBattles_IsInBattle = C_PetBattles.IsInBattle
local C_PvP_IsRatedBattleground = C_PvP.IsRatedBattleground
local C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo = C_UIWidgetManager.GetStatusBarWidgetVisualizationInfo
local FACTION_HORDE = FACTION_HORDE
local FACTION_ALLIANCE = FACTION_ALLIANCE
local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
......@@ -48,7 +47,7 @@ function E:ClassColor(class, usePriestColor)
color.colorStr = 'ff'..color.colorStr
end
if (usePriestColor and class == 'PRIEST') and tonumber(color.colorStr, 16) > tonumber(E.PriestColors.colorStr, 16) then
if usePriestColor and class == 'PRIEST' and tonumber(color.colorStr, 16) > tonumber(E.PriestColors.colorStr, 16) then
return E.PriestColors
else
return color
......@@ -206,36 +205,6 @@ do
end
end
do
function E:GetWidgetInfoID(guid)
return E.global.nameplate.widgetMap[guid]
end
function E:SetWidgetInfoID(guid, widgetID)
if widgetID then
E.global.nameplate.widgetMap[guid] = widgetID
end
end
E.MaxWidgetInfoRank = 30
function E:GetWidgetInfoBase(widgetID)
local widget = widgetID and C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo(widgetID)
if not widget then return end
local cur = widget.barValue - widget.barMin
local toNext = widget.barMax - widget.barMin
local total = widget.barValue
local rank, maxRank
if widget.overrideBarText then
rank = tonumber(strmatch(widget.overrideBarText, '%d+'))
maxRank = rank == E.MaxWidgetInfoRank
end
return cur, toNext, total, rank, maxRank
end
end
do
local Masque = E.Libs.Masque
local MasqueGroupState = {}
......@@ -320,7 +289,7 @@ do
if module == 'all' then
for moduName, modu in pairs(self.modules) do
for funcName, func in pairs(modu) do
if (funcName ~= 'GetModule') and (type(func) == 'function') then
if funcName ~= 'GetModule' and type(func) == 'function' then
CPU_USAGE[moduName..':'..funcName] = GetFunctionCPUUsage(func, true)
end
end
......
......@@ -21,14 +21,14 @@ end
--TEST
--[[local t = UIParent:CreateFontString(nil, 'OVERLAY', 'GameTooltipText')
t:SetText(0)
t:SetPoint('CENTER')
t:Point('CENTER')
t:FontTemplate(nil, 20)
E:SetUpAnimGroup(t, 'Number', 10, 5)
local b = CreateFrame('BUTTON', nil, UIParent)
b:SetPoint('CENTER', 0, -100)
b:Point('CENTER', 0, -100)
b:SetTemplate()
b:SetSize(40,30)
b:Size(40,30)
b:EnableMouse(true)
b:SetScript('OnClick', function()
if t:GetText() == 10 then
......
......@@ -124,19 +124,19 @@ do
end
local function OnUpdate(self, elapsed)
if(self.elapsed and self.elapsed > 0.1) then
if self.elapsed and self.elapsed > 0.1 then
self.tex:SetTexCoord((self.curFrame - 1) * 0.1, 0, (self.curFrame - 1) * 0.1, 1, self.curFrame * 0.1, 0, self.curFrame * 0.1, 1)
if(self.countUp) then
if self.countUp then
self.curFrame = self.curFrame + 1
else
self.curFrame = self.curFrame - 1
end
if(self.curFrame > 10) then
if self.curFrame > 10 then
self.countUp = false
self.curFrame = 9
elseif(self.curFrame < 1) then
elseif self.curFrame < 1 then
self.countUp = true
self.curFrame = 2
end
......@@ -154,7 +154,7 @@ do
--Store old settings
local t = self.db.tempSettings
local c = self.db.general.backdropcolor
if(self:HelloKittyFixCheck()) then
if self:HelloKittyFixCheck() then
E:HelloKittyFix()
else
self.oldEnableAllSound = GetCVar('Sound_EnableAllSound')
......@@ -216,13 +216,13 @@ do
function E:RestoreHelloKitty()
--Store old settings
self.db.general.kittys = false
if(_G.HelloKittyLeft) then
if _G.HelloKittyLeft then
_G.HelloKittyLeft:Hide()
_G.HelloKittyRight:Hide()
end
if not(self.db.tempSettings) then return end
if(self:HelloKittyFixCheck()) then
if self:HelloKittyFixCheck() then
self:HelloKittyFix()
self.db.tempSettings = nil
return
......@@ -260,17 +260,17 @@ do
end
function E:CreateKittys()
if(_G.HelloKittyLeft) then
if _G.HelloKittyLeft then
_G.HelloKittyLeft:Show()
_G.HelloKittyRight:Show()
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')
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)
......@@ -283,11 +283,11 @@ 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')
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)
......@@ -303,8 +303,8 @@ do
--When it bugged out for a user the command '/hellokittyfix' attempted to restore the changed settings to default
function E:HelloKittyFixCheck(secondCheck)
local t = self.db.tempSettings
if(not t and not secondCheck) then t = self.db.general end
if(t and t.backdropcolor)then
if not t and not secondCheck then t = self.db.general end
if t and t.backdropcolor then
return self:Round(t.backdropcolor.r, 2) == 0.87 and self:Round(t.backdropcolor.g, 2) == 0.3 and self:Round(t.backdropcolor.b, 2) == 0.74
end
end
......@@ -336,7 +336,7 @@ do
self.db.unitframe.colors.auraBarBuff = {r = c.r, g = c.g, b = c.b}
self.db.unitframe.colors.transparentAurabars = false
if(_G.HelloKittyLeft) then
if _G.HelloKittyLeft then
_G.HelloKittyLeft:Hide()
_G.HelloKittyRight:Hide()
self.db.general.kittys = nil
......@@ -348,7 +348,7 @@ do
end
function E:HelloKittyToggle()
if(_G.HelloKittyLeft and _G.HelloKittyLeft:IsShown()) then
if _G.HelloKittyLeft and _G.HelloKittyLeft:IsShown() then
self:RestoreHelloKitty()
else
self:StaticPopup_Show('HELLO_KITTY')
......
......@@ -19,9 +19,9 @@ local GetNumGuildMembers = GetNumGuildMembers
local GuildControlGetNumRanks = GuildControlGetNumRanks
local GuildControlGetRankName = GuildControlGetRankName
local GuildUninvite = GuildUninvite
local ReloadUI = ReloadUI
local ResetCPUUsage = ResetCPUUsage
local SendChatMessage = SendChatMessage
local ReloadUI = ReloadUI
local SetCVar = SetCVar
local UpdateAddOnCPUUsage = UpdateAddOnCPUUsage
-- GLOBALS: ElvUIGrid, ElvDB
......@@ -43,7 +43,7 @@ function E:LuaError(msg)
if switch == 'on' or switch == '1' then
for i=1, GetNumAddOns() do
local name = GetAddOnInfo(i)
if (name ~= 'ElvUI' and name ~= 'ElvUI_OptionsUI') and E:IsAddOnEnabled(name) then
if name ~= 'ElvUI' and name ~= 'ElvUI_OptionsUI' and E:IsAddOnEnabled(name) then
DisableAddOn(name, E.myname)
ElvDB.LuaErrorDisabledAddOns[name] = i
end
......@@ -77,7 +77,7 @@ end
function E:DelayScriptCall(msg)
local secs, command = msg:match('^(%S+)%s+(.*)$')
secs = tonumber(secs)
if (not secs) or (#command == 0) then
if not secs or (#command == 0) then
self:Print('usage: /in <seconds> <command>')
self:Print('example: /in 1.5 /say hi')
else
......
......@@ -23,7 +23,7 @@ local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
local RESET = RESET
-- GLOBALS: ElvUIMoverPopupWindow, ElvUIMoverNudgeWindow, ElvUIMoverPopupWindowDropDown
local ConfigTooltip = CreateFrame('GameTooltip', 'ElvUIConfigTooltip', E.UIParent, 'GameTooltipTemplate')
local ConfigTooltip = CreateFrame('GameTooltip', 'ElvUIConfigTooltip', E.UIParent, 'GameTooltipTemplate, BackdropTemplate')
local grid
E.ConfigModeLayouts = {
......@@ -133,28 +133,33 @@ function E:Grid_Create()
local width, height = E.UIParent:GetSize()
local size, half = E.mult / 2, height / 2
local gSize = E.db.gridSize
local gHalf = gSize / 2
local ratio = width / height
local hStepheight = height * ratio
local wStep = width / E.db.gridSize
local hStep = hStepheight / E.db.gridSize
local hHeight = height * ratio
local wStep = width / gSize
local hStep = hHeight / gSize
grid.boxSize = E.db.gridSize
grid.boxSize = gSize
grid:SetPoint('CENTER', E.UIParent)
grid:SetSize(width, height)
grid:Size(width, height)
grid:Show()
for i = 0, E.db.gridSize do
for i = 0, gSize do
local tx = E:Grid_GetRegion()
if i == E.db.gridSize / 2 then
if i == gHalf then
tx:SetColorTexture(1, 0, 0)
tx:SetDrawLayer('BACKGROUND', 1)
else
tx:SetColorTexture(0, 0, 0)
tx:SetDrawLayer('BACKGROUND', 0)
end
local iwStep = i*wStep
tx:ClearAllPoints()
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', i*wStep - size, 0)
tx:SetPoint('BOTTOMRIGHT', grid, 'BOTTOMLEFT', i*wStep + size, 0)
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', iwStep - size, 0)
tx:SetPoint('BOTTOMRIGHT', grid, 'BOTTOMLEFT', iwStep + size, 0)
end
do
......@@ -166,20 +171,23 @@ function E:Grid_Create()
tx:SetPoint('BOTTOMRIGHT', grid, 'TOPRIGHT', 0, -(half + size))
end
for i = 1, floor((height/2)/hStep) do
local hSteps = floor((height/2)/hStep)
for i = 1, hSteps do
local ihStep = i*hStep
local tx = E:Grid_GetRegion()
tx:SetColorTexture(0, 0, 0)
tx:SetDrawLayer('BACKGROUND', 0)
tx:ClearAllPoints()
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', 0, -(half+i*hStep) + size)
tx:SetPoint('BOTTOMRIGHT', grid, 'TOPRIGHT', 0, -(half+i*hStep + size))
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', 0, -(half+ihStep) + size)
tx:SetPoint('BOTTOMRIGHT', grid, 'TOPRIGHT', 0, -(half+ihStep + size))
tx = E:Grid_GetRegion()
tx:SetColorTexture(0, 0, 0)
tx:SetDrawLayer('BACKGROUND', 0)
tx:ClearAllPoints()
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', 0, -(half-i*hStep) + size)
tx:SetPoint('BOTTOMRIGHT', grid, 'TOPRIGHT', 0, -(half-i*hStep + size))
tx:SetPoint('TOPLEFT', grid, 'TOPLEFT', 0, -(half-ihStep) + size)
tx:SetPoint('BOTTOMRIGHT', grid, 'TOPRIGHT', 0, -(half-ihStep + size))
end
end
......@@ -201,22 +209,6 @@ local function ConfigMode_Initialize()
_G.UIDropDownMenu_SetSelectedValue(dd, dd.selectedValue or 'ALL')
end
function E:MoverNudgeOnShow()
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
end
function E:MoverNudgeHeaderOnShow()
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
end
function E:MoverPopupOnShow()
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
end
function E:MoverPopupHeaderOnShow()
self:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
end
function E:NudgeMover(nudgeX, nudgeY)
local mover = ElvUIMoverNudgeWindow.child
local x, y, point = E:CalculateMoverPoints(mover, nudgeX, nudgeY)
......@@ -251,54 +243,56 @@ function E:AssignFrameToNudge()
end
function E:CreateMoverPopup()
local f = CreateFrame('Frame', 'ElvUIMoverPopupWindow', _G.UIParent)
local r, g, b = unpack(E.media.rgbvaluecolor)
local f = CreateFrame('Frame', 'ElvUIMoverPopupWindow', _G.UIParent, 'BackdropTemplate')
f:SetFrameStrata('DIALOG')
f:SetToplevel(true)
f:EnableMouse(true)
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))
f:SetScript('OnShow', E.MoverPopupOnShow)
f:CreateShadow(5)
f:Point('BOTTOM', _G.UIParent, 'CENTER', 0, 100)
f:Hide()
local header = CreateFrame('Button', nil, f)
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)
header:RegisterForClicks('AnyUp', 'AnyDown')
header:SetScript('OnMouseDown', function() f:StartMoving() end)
header:SetScript('OnMouseUp', function() f:StopMovingOrSizing() end)
header:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor))
header:SetScript('OnShow', E.MoverPopupHeaderOnShow)
f.header = header
local title = header:CreateFontString(nil, 'OVERLAY')
title:FontTemplate()
title:SetPoint('CENTER', header, 'CENTER')
title:Point('CENTER', header, 'CENTER')
title:SetText('ElvUI')
f.title = title
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"])
f.desc = desc
local snapping = CreateFrame('CheckButton', f:GetName()..'CheckButton', f, 'OptionsCheckButtonTemplate')
_G[snapping:GetName() .. 'Text']:SetText(L["Sticky Frames"])
local snapName = f:GetName()..'CheckButton'
local snapping = CreateFrame('CheckButton', snapName, f, 'OptionsCheckButtonTemplate')
snapping:SetScript('OnShow', function(cb) cb:SetChecked(E.db.general.stickyFrames) end)
snapping:SetScript('OnClick', function(cb) E.db.general.stickyFrames = cb:GetChecked() end)
snapping.text = _G[snapName..'Text']
snapping.text:SetText(L["Sticky Frames"])
f.snapping = snapping
local lock = CreateFrame('Button', f:GetName()..'CloseButton', f, 'OptionsButtonTemplate')
_G[lock:GetName() .. 'Text']:SetText(L["Lock"])
local lock = CreateFrame('Button', f:GetName()..'CloseButton', f, 'OptionsButtonTemplate, BackdropTemplate')
lock.Text:SetText(L["Lock"])
lock:SetScript('OnClick', function()
E:ToggleMoveMode()
......@@ -310,9 +304,10 @@ function E:CreateMoverPopup()
end
end
end)
f.lock = lock
local align = CreateFrame('EditBox', f:GetName()..'EditBox', f, 'InputBoxTemplate')
align:SetSize(24, 17)
local align = CreateFrame('EditBox', f:GetName()..'EditBox', f, 'InputBoxTemplate, BackdropTemplate')
align:Size(24, 17)
align:SetAutoFocus(false)
align:SetScript('OnEscapePressed', function(eb)
eb:SetText(E.db.gridSize)
......@@ -342,13 +337,14 @@ 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:"])
f.align = align
--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)
......@@ -363,26 +359,26 @@ function E:CreateMoverPopup()
end
end)
local configMode = CreateFrame('Frame', f:GetName()..'DropDown', f, 'UIDropDownMenuTemplate')
configMode:SetPoint('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:SetText(L["Config Mode:"])
local dropDown = CreateFrame('Frame', f:GetName()..'DropDown', f, 'UIDropDownMenuTemplate')
dropDown:Point('BOTTOMRIGHT', lock, 'TOPRIGHT', 8, -5)
S:HandleDropDownBox(dropDown, 165)
dropDown.text = dropDown:CreateFontString(nil, 'OVERLAY', 'GameFontNormal')
dropDown.text:Point('RIGHT', dropDown.backdrop, 'LEFT', -2, 0)
dropDown.text:SetText(L["Config Mode:"])
f.dropDown = dropDown
_G.UIDropDownMenu_Initialize(configMode, ConfigMode_Initialize)
_G.UIDropDownMenu_Initialize(dropDown, ConfigMode_Initialize)
local nudgeFrame = CreateFrame('Frame', 'ElvUIMoverNudgeWindow', E.UIParent)
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))
nudgeFrame.shadow:SetBackdropBorderColor(r, g, b, 0.9)
nudgeFrame:SetFrameLevel(500)
nudgeFrame:EnableMouse(true)
nudgeFrame:SetClampedToScreen(true)
nudgeFrame:SetPropagateKeyboardInput(true)
nudgeFrame:SetScript('OnShow', E.MoverNudgeOnShow)
nudgeFrame:SetScript('OnKeyDown', function(_, btn)
local Mod = IsAltKeyDown() or IsControlKeyDown()
if btn == 'NUMPAD4' then
......@@ -402,28 +398,26 @@ 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
nudgeFrame.desc = desc
header = CreateFrame('Button', nil, nudgeFrame)
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))
header:SetScript('OnShow', E.MoverNudgeHeaderOnShow)
nudgeFrame.header = header
title = header:CreateFontString(nil, 'OVERLAY')
title:FontTemplate()
title:SetPoint('CENTER', header, 'CENTER')
title:Point('CENTER', header, 'CENTER')
title:SetText(L["Nudge"])
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)
......@@ -450,14 +444,14 @@ 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
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)
......@@ -484,16 +478,16 @@ 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')
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:Point('TOP', nudgeFrame, 'CENTER', 0, 2)
resetButton:Size(100, 25)
resetButton:SetScript('OnClick', function()
if ElvUIMoverNudgeWindow.child.textString then
E:ResetMovers(ElvUIMoverNudgeWindow.child.textString)
......@@ -502,36 +496,36 @@ function E:CreateMoverPopup()
S:HandleButton(resetButton)
nudgeFrame.resetButton = resetButton
local upButton = CreateFrame('Button', nudgeFrame:GetName()..'UpButton', nudgeFrame)
upButton:SetPoint('BOTTOMRIGHT', nudgeFrame, 'BOTTOM', -6, 4)
local upButton = CreateFrame('Button', nudgeFrame:GetName()..'UpButton', nudgeFrame, 'BackdropTemplate')
upButton:Point('BOTTOMRIGHT', nudgeFrame, 'BOTTOM', -6, 4)
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)
downButton:SetPoint('BOTTOMLEFT', nudgeFrame, 'BOTTOM', 6, 4)
local downButton = CreateFrame('Button', nudgeFrame:GetName()..'DownButton', nudgeFrame, 'BackdropTemplate')
downButton:Point('BOTTOMLEFT', nudgeFrame, 'BOTTOM', 6, 4)
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)
leftButton:SetPoint('RIGHT', upButton, 'LEFT', -6, 0)
local leftButton = CreateFrame('Button', nudgeFrame:GetName()..'LeftButton', nudgeFrame, 'BackdropTemplate')
leftButton:Point('RIGHT', upButton, 'LEFT', -6, 0)