diff --git a/SVUITheme_Simple/SVUITheme_Simple.lua b/SVUITheme_Simple/SVUITheme_Simple.lua index 6abe496..c8f9530 100644 --- a/SVUITheme_Simple/SVUITheme_Simple.lua +++ b/SVUITheme_Simple/SVUITheme_Simple.lua @@ -98,9 +98,9 @@ local _SetDockStyleTheme = function(frame, isBottom) end local _SetBorderTheme = function(self) - self.Border.Top:ModPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) - self.Border.Top:ModPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) - self.Border.Top:ModHeight(10) + self.Border.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) + self.Border.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) + self.Border.Top:SetHeight(10) self.Border.Top:SetBackdrop({ bgFile = [[Interface\BUTTONS\WHITE8X8]], edgeFile = [[Interface\BUTTONS\WHITE8X8]], @@ -118,9 +118,9 @@ local _SetBorderTheme = function(self) self:SetFrameStrata('BACKGROUND') end) - self.Border.Bottom:ModPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) - self.Border.Bottom:ModPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) - self.Border.Bottom:ModHeight(10) + self.Border.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) + self.Border.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) + self.Border.Bottom:SetHeight(10) self.Border.Bottom:SetBackdrop({ bgFile = [[Interface\BUTTONS\WHITE8X8]], edgeFile = [[Interface\BUTTONS\WHITE8X8]], diff --git a/SVUI_!Core/setup/installer.lua b/SVUI_!Core/setup/installer.lua index fdb2ef9..254bedb 100644 --- a/SVUI_!Core/setup/installer.lua +++ b/SVUI_!Core/setup/installer.lua @@ -685,7 +685,7 @@ local InstallerFrame_PreparePage = function(self) self.Option01.Arg = nil self.Option01.ClickIndex = nil self.Option01:SetWidth(160) - self.Option01.texture:ModSize(160, 160) + self.Option01.texture:SetSize(160, 160) self.Option01.texture:SetPoint("CENTER", self.Option01, "BOTTOM", 0, -(160 * 0.09)) self.Option01:ClearAllPoints() self.Option01:SetPoint("BOTTOM", 0, 15) @@ -713,7 +713,7 @@ local InstallerFrame_PreparePage = function(self) self.Option1.Arg = nil self.Option1.ClickIndex = nil self.Option1:SetWidth(160) - self.Option1.texture:ModSize(160, 160) + self.Option1.texture:SetSize(160, 160) self.Option1.texture:SetPoint("CENTER", self.Option1, "BOTTOM", 0, -(160 * 0.09)) self.Option1:ClearAllPoints() self.Option1:SetPoint("BOTTOM", 0, 15) @@ -725,7 +725,7 @@ local InstallerFrame_PreparePage = function(self) self.Option2.Arg = nil self.Option2.ClickIndex = nil self.Option2:SetWidth(120) - self.Option2.texture:ModSize(120, 120) + self.Option2.texture:SetSize(120, 120) self.Option2.texture:SetPoint("CENTER", self.Option2, "BOTTOM", 0, -(120 * 0.09)) self.Option2:ClearAllPoints() self.Option2:SetPoint("BOTTOMLEFT", self, "BOTTOM", 4, 15) @@ -737,7 +737,7 @@ local InstallerFrame_PreparePage = function(self) self.Option3.Arg = nil self.Option3.ClickIndex = nil self.Option3:SetWidth(120) - self.Option3.texture:ModSize(120, 120) + self.Option3.texture:SetSize(120, 120) self.Option3.texture:SetPoint("CENTER", self.Option3, "BOTTOM", 0, -(120 * 0.09)) self.Option3:ClearAllPoints() self.Option3:SetPoint("LEFT", self.Option2, "RIGHT", 4, 0) @@ -749,7 +749,7 @@ local InstallerFrame_PreparePage = function(self) self.Option4.Arg = nil self.Option4.ClickIndex = nil self.Option4:SetWidth(110) - self.Option4.texture:ModSize(110, 110) + self.Option4.texture:SetSize(110, 110) self.Option4.texture:SetPoint("CENTER", self.Option4, "BOTTOM", 0, -(110 * 0.09)) self.Option4:ClearAllPoints() self.Option4:SetPoint("LEFT", self.Option3, "RIGHT", 4, 0) @@ -770,11 +770,11 @@ local InstallerFrame_PreparePage = function(self) if CURRENT_PAGE == MAX_PAGE then self.Next:Disable() self.Next:Hide() - self:ModSize(550, 350) + self:SetSize(550, 350) else self.Next:Enable() self.Next:Show() - self:ModSize(550,400) + self:SetSize(550,400) end end @@ -860,7 +860,7 @@ function SV.Setup:Install(autoLoaded) if not SVUI_InstallerFrame then local frame = CreateFrame("Button", "SVUI_InstallerFrame", UIParent) - frame:ModSize(550, 400) + frame:SetSize(550, 400) frame:SetStyle("Frame", "Window2") frame:SetPoint("TOP", SV.Screen, "TOP", 0, -150) frame:SetFrameStrata("TOOLTIP") @@ -872,11 +872,11 @@ function SV.Setup:Install(autoLoaded) frame.Next = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Next:RemoveTextures() - frame.Next:ModSize(110, 25) + frame.Next:SetSize(110, 25) frame.Next:SetPoint("BOTTOMRIGHT", 50, 5) SetInstallButton(frame.Next) frame.Next.texture = frame.Next:CreateTexture(nil, "BORDER") - frame.Next.texture:ModSize(110, 75) + frame.Next.texture:SetSize(110, 75) frame.Next.texture:SetPoint("RIGHT") frame.Next.texture:SetTexture(SV.media.button.arrow) frame.Next.texture:SetVertexColor(1, 0.5, 0) @@ -898,11 +898,11 @@ function SV.Setup:Install(autoLoaded) frame.Prev = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Prev:RemoveTextures() - frame.Prev:ModSize(110, 25) + frame.Prev:SetSize(110, 25) frame.Prev:SetPoint("BOTTOMLEFT", -50, 5) SetInstallButton(frame.Prev) frame.Prev.texture = frame.Prev:CreateTexture(nil, "BORDER") - frame.Prev.texture:ModSize(110, 75) + frame.Prev.texture:SetSize(110, 75) frame.Prev.texture:SetPoint("LEFT") frame.Prev.texture:SetTexture(SV.media.button.arrow) frame.Prev.texture:SetTexCoord(1, 0, 1, 1, 0, 0, 0, 1) @@ -925,12 +925,12 @@ function SV.Setup:Install(autoLoaded) frame.Option01 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option01:RemoveTextures() - frame.Option01:ModSize(160, 30) + frame.Option01:SetSize(160, 30) frame.Option01:SetPoint("BOTTOM", 0, 15) frame.Option01:SetText("") SetInstallButton(frame.Option01) frame.Option01.texture = frame.Option01:CreateTexture(nil, "BORDER") - frame.Option01.texture:ModSize(160, 160) + frame.Option01.texture:SetSize(160, 160) frame.Option01.texture:SetPoint("CENTER", frame.Option01, "BOTTOM", 0, -15) frame.Option01.texture:SetTexture(SV.media.button.option) frame.Option01.texture:SetGradient("VERTICAL", 0, 0.3, 0, 0, 0.7, 0) @@ -947,12 +947,12 @@ function SV.Setup:Install(autoLoaded) frame.Option02 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option02:RemoveTextures() - frame.Option02:ModSize(130, 30) + frame.Option02:SetSize(130, 30) frame.Option02:SetPoint("BOTTOMLEFT", frame, "BOTTOM", 4, 15) frame.Option02:SetText("") SetInstallButton(frame.Option02) frame.Option02.texture = frame.Option02:CreateTexture(nil, "BORDER") - frame.Option02.texture:ModSize(130, 110) + frame.Option02.texture:SetSize(130, 110) frame.Option02.texture:SetPoint("CENTER", frame.Option02, "BOTTOM", 0, -15) frame.Option02.texture:SetTexture(SV.media.button.option) frame.Option02.texture:SetGradient("VERTICAL", 0, 0.1, 0.3, 0, 0.5, 0.7) @@ -965,7 +965,7 @@ function SV.Setup:Install(autoLoaded) frame.Option02:SetScript("OnShow", function() if(not frame.Option03:IsShown()) then frame.Option01:SetWidth(130) - frame.Option01.texture:ModSize(130, 130) + frame.Option01.texture:SetSize(130, 130) frame.Option01.texture:SetPoint("CENTER", frame.Option01, "BOTTOM", 0, -(130 * 0.09)) frame.Option01:ClearAllPoints() frame.Option01:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -4, 15) @@ -978,12 +978,12 @@ function SV.Setup:Install(autoLoaded) frame.Option03 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option03:RemoveTextures() - frame.Option03:ModSize(130, 30) + frame.Option03:SetSize(130, 30) frame.Option03:SetPoint("BOTTOM", frame, "BOTTOM", 0, 15) frame.Option03:SetText("") SetInstallButton(frame.Option03) frame.Option03.texture = frame.Option03:CreateTexture(nil, "BORDER") - frame.Option03.texture:ModSize(130, 110) + frame.Option03.texture:SetSize(130, 110) frame.Option03.texture:SetPoint("CENTER", frame.Option03, "BOTTOM", 0, -15) frame.Option03.texture:SetTexture(SV.media.button.option) frame.Option03.texture:SetGradient("VERTICAL", 0.3, 0, 0, 0.7, 0, 0) @@ -995,17 +995,17 @@ function SV.Setup:Install(autoLoaded) end) frame.Option03:SetScript("OnShow", function(this) this:SetWidth(130) - this.texture:ModSize(130, 130) + this.texture:SetSize(130, 130) this.texture:SetPoint("CENTER", this, "BOTTOM", 0, -(130 * 0.09)) frame.Option01:SetWidth(130) - frame.Option01.texture:ModSize(130, 130) + frame.Option01.texture:SetSize(130, 130) frame.Option01.texture:SetPoint("CENTER", frame.Option01, "BOTTOM", 0, -(130 * 0.09)) frame.Option01:ClearAllPoints() frame.Option01:SetPoint("RIGHT", this, "LEFT", -8, 0) frame.Option02:SetWidth(130) - frame.Option02.texture:ModSize(130, 130) + frame.Option02.texture:SetSize(130, 130) frame.Option02.texture:SetPoint("CENTER", frame.Option02, "BOTTOM", 0, -(130 * 0.09)) frame.Option02:ClearAllPoints() frame.Option02:SetPoint("LEFT", this, "RIGHT", 8, 0) @@ -1017,12 +1017,12 @@ function SV.Setup:Install(autoLoaded) frame.Option1 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option1:RemoveTextures() - frame.Option1:ModSize(160, 30) + frame.Option1:SetSize(160, 30) frame.Option1:SetPoint("BOTTOM", 0, 15) frame.Option1:SetText("") SetInstallButton(frame.Option1) frame.Option1.texture = frame.Option1:CreateTexture(nil, "BORDER") - frame.Option1.texture:ModSize(160, 160) + frame.Option1.texture:SetSize(160, 160) frame.Option1.texture:SetPoint("CENTER", frame.Option1, "BOTTOM", 0, -15) frame.Option1.texture:SetTexture(SV.media.button.option) frame.Option1.texture:SetGradient("VERTICAL", 0.3, 0.3, 0.3, 0.7, 0.7, 0.7) @@ -1039,12 +1039,12 @@ function SV.Setup:Install(autoLoaded) frame.Option2 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option2:RemoveTextures() - frame.Option2:ModSize(120, 30) + frame.Option2:SetSize(120, 30) frame.Option2:SetPoint("BOTTOMLEFT", frame, "BOTTOM", 4, 15) frame.Option2:SetText("") SetInstallButton(frame.Option2) frame.Option2.texture = frame.Option2:CreateTexture(nil, "BORDER") - frame.Option2.texture:ModSize(120, 110) + frame.Option2.texture:SetSize(120, 110) frame.Option2.texture:SetPoint("CENTER", frame.Option2, "BOTTOM", 0, -15) frame.Option2.texture:SetTexture(SV.media.button.option) frame.Option2.texture:SetGradient("VERTICAL", 0.3, 0.3, 0.3, 0.7, 0.7, 0.7) @@ -1057,7 +1057,7 @@ function SV.Setup:Install(autoLoaded) frame.Option2:SetScript("OnShow", function() if(not frame.Option3:IsShown() and (not frame.Option4:IsShown())) then frame.Option1:SetWidth(120) - frame.Option1.texture:ModSize(120, 120) + frame.Option1.texture:SetSize(120, 120) frame.Option1.texture:SetPoint("CENTER", frame.Option1, "BOTTOM", 0, -(120 * 0.09)) frame.Option1:ClearAllPoints() frame.Option1:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -4, 15) @@ -1070,12 +1070,12 @@ function SV.Setup:Install(autoLoaded) frame.Option3 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option3:RemoveTextures() - frame.Option3:ModSize(110, 30) + frame.Option3:SetSize(110, 30) frame.Option3:SetPoint("LEFT", frame.Option2, "RIGHT", 4, 0) frame.Option3:SetText("") SetInstallButton(frame.Option3) frame.Option3.texture = frame.Option3:CreateTexture(nil, "BORDER") - frame.Option3.texture:ModSize(110, 100) + frame.Option3.texture:SetSize(110, 100) frame.Option3.texture:SetPoint("CENTER", frame.Option3, "BOTTOM", 0, -9) frame.Option3.texture:SetTexture(SV.media.button.option) frame.Option3.texture:SetGradient("VERTICAL", 0.3, 0.3, 0.3, 0.7, 0.7, 0.7) @@ -1088,19 +1088,19 @@ function SV.Setup:Install(autoLoaded) frame.Option3:SetScript("OnShow", function(this) if(not frame.Option4:IsShown()) then frame.Option2:SetWidth(110) - frame.Option2.texture:ModSize(110, 110) + frame.Option2.texture:SetSize(110, 110) frame.Option2.texture:SetPoint("CENTER", frame.Option2, "BOTTOM", 0, -(110 * 0.09)) frame.Option2:ClearAllPoints() frame.Option2:SetPoint("BOTTOM", frame, "BOTTOM", 0, 15) frame.Option1:SetWidth(110) - frame.Option1.texture:ModSize(110, 110) + frame.Option1.texture:SetSize(110, 110) frame.Option1.texture:SetPoint("CENTER", frame.Option1, "BOTTOM", 0, -(110 * 0.09)) frame.Option1:ClearAllPoints() frame.Option1:SetPoint("RIGHT", frame.Option2, "LEFT", -4, 0) this:SetWidth(110) - this.texture:ModSize(110, 110) + this.texture:SetSize(110, 110) this.texture:SetPoint("CENTER", this, "BOTTOM", 0, -(110 * 0.09)) this:ClearAllPoints() this:SetPoint("LEFT", frame.Option2, "RIGHT", 4, 0) @@ -1113,12 +1113,12 @@ function SV.Setup:Install(autoLoaded) frame.Option4 = CreateFrame("Button", nil, frame, "UIPanelButtonTemplate") frame.Option4:RemoveTextures() - frame.Option4:ModSize(110, 30) + frame.Option4:SetSize(110, 30) frame.Option4:SetPoint("LEFT", frame.Option3, "RIGHT", 4, 0) frame.Option4:SetText("") SetInstallButton(frame.Option4) frame.Option4.texture = frame.Option4:CreateTexture(nil, "BORDER") - frame.Option4.texture:ModSize(110, 100) + frame.Option4.texture:SetSize(110, 100) frame.Option4.texture:SetPoint("CENTER", frame.Option4, "BOTTOM", 0, -9) frame.Option4.texture:SetTexture(SV.media.button.option) frame.Option4.texture:SetGradient("VERTICAL", 0.3, 0.3, 0.3, 0.7, 0.7, 0.7) @@ -1130,20 +1130,20 @@ function SV.Setup:Install(autoLoaded) end) frame.Option4:SetScript("OnShow", function() - frame.Option2:ModWidth(110) - frame.Option2.texture:ModSize(110, 110) + frame.Option2:SetWidth(110) + frame.Option2.texture:SetSize(110, 110) frame.Option2.texture:SetPoint("CENTER", frame.Option2, "BOTTOM", 0, -(110 * 0.09)) frame.Option2:ClearAllPoints() frame.Option2:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -4, 15) - frame.Option1:ModWidth(110) - frame.Option1.texture:ModSize(110, 110) + frame.Option1:SetWidth(110) + frame.Option1.texture:SetSize(110, 110) frame.Option1.texture:SetPoint("CENTER", frame.Option1, "BOTTOM", 0, -(110 * 0.09)) frame.Option1:ClearAllPoints() frame.Option1:SetPoint("RIGHT", frame.Option2, "LEFT", -4, 0) frame.Option3:SetWidth(110) - frame.Option3.texture:ModSize(110, 110) + frame.Option3.texture:SetSize(110, 110) frame.Option3.texture:SetPoint("CENTER", frame.Option3, "BOTTOM", 0, -(110 * 0.09)) frame.Option3:ClearAllPoints() frame.Option3:SetPoint("LEFT", frame.Option2, "RIGHT", 4, 0) @@ -1156,8 +1156,8 @@ function SV.Setup:Install(autoLoaded) local statusHolder = CreateFrame("Frame", nil, frame) statusHolder:SetFrameLevel(statusHolder:GetFrameLevel() + 2) - statusHolder:ModSize(150, 30) - statusHolder:ModPoint("BOTTOM", frame, "TOP", 0, 2) + statusHolder:SetSize(150, 30) + statusHolder:SetPoint("BOTTOM", frame, "TOP", 0, 2) frame.Status = statusHolder:CreateFontString(nil, "OVERLAY") frame.Status:SetFont(SV.media.font.number, 22, "OUTLINE") @@ -1166,27 +1166,27 @@ function SV.Setup:Install(autoLoaded) local titleHolder = frame:CreateFontString(nil, "OVERLAY") titleHolder:SetFont(SV.media.font.dialog, 22, "OUTLINE") - titleHolder:ModPoint("TOP", 0, -5) + titleHolder:SetPoint("TOP", 0, -5) titleHolder:SetText(L["SVUI Installation"]) frame.SubTitle = frame:CreateFontString(nil, "OVERLAY") frame.SubTitle:SetFont(SV.media.font.alert, 16, "OUTLINE") - frame.SubTitle:ModPoint("TOP", 0, -40) + frame.SubTitle:SetPoint("TOP", 0, -40) frame.Desc1 = frame:CreateFontString(nil, "OVERLAY") frame.Desc1:SetFont(SV.media.font.default, 14, "OUTLINE") - frame.Desc1:ModPoint("TOPLEFT", 20, -75) - frame.Desc1:ModWidth(frame:GetWidth()-40) + frame.Desc1:SetPoint("TOPLEFT", 20, -75) + frame.Desc1:SetWidth(frame:GetWidth()-40) frame.Desc2 = frame:CreateFontString(nil, "OVERLAY") frame.Desc2:SetFont(SV.media.font.default, 14, "OUTLINE") - frame.Desc2:ModPoint("TOPLEFT", 20, -125) - frame.Desc2:ModWidth(frame:GetWidth()-40) + frame.Desc2:SetPoint("TOPLEFT", 20, -125) + frame.Desc2:SetWidth(frame:GetWidth()-40) frame.Desc3 = frame:CreateFontString(nil, "OVERLAY") frame.Desc3:SetFont(SV.media.font.default, 14, "OUTLINE") - frame.Desc3:ModPoint("TOPLEFT", 20, -175) - frame.Desc3:ModWidth(frame:GetWidth()-40) + frame.Desc3:SetPoint("TOPLEFT", 20, -175) + frame.Desc3:SetWidth(frame:GetWidth()-40) --[[ MISC ]]-- @@ -1195,9 +1195,9 @@ function SV.Setup:Install(autoLoaded) closeButton:SetScript("OnClick", function() frame:Hide() end) local tutorialImage = frame:CreateTexture(nil, "OVERLAY") - tutorialImage:ModSize(256, 128) + tutorialImage:SetSize(256, 128) tutorialImage:SetTexture(SV.SplashImage) - tutorialImage:ModPoint("BOTTOM", 0, 70) + tutorialImage:SetPoint("BOTTOM", 0, 70) end SVUI_InstallerFrame:SetScript("OnHide", function() diff --git a/SVUI_!Core/setup/theme_select.lua b/SVUI_!Core/setup/theme_select.lua index daf231f..940b48a 100644 --- a/SVUI_!Core/setup/theme_select.lua +++ b/SVUI_!Core/setup/theme_select.lua @@ -37,7 +37,7 @@ local L = SV.L; function SV.Setup:SelectTheme() if not SVUI_ThemeSelectFrame then local frame = CreateFrame("Button", "SVUI_ThemeSelectFrame", UIParent) - frame:ModSize(350, 145) + frame:SetSize(350, 145) frame:SetStyle("Frame", "Window2") frame:SetPoint("CENTER", SV.Screen, "CENTER", 0, 0) frame:SetFrameStrata("TOOLTIP"); @@ -55,7 +55,7 @@ function SV.Setup:SelectTheme() local themeButton = SVUI_ThemeSelectFrame[themeName] if(not themeButton) then themeButton = CreateFrame("Frame", nil, SVUI_ThemeSelectFrame) - themeButton:ModSize(125, 125) + themeButton:SetSize(125, 125) themeButton:SetPoint("TOP", SVUI_ThemeSelectFrame, "TOP", 0, yOffset) themeButton.texture = themeButton:CreateTexture(nil, "BORDER") themeButton.texture:SetAllPoints() @@ -87,7 +87,7 @@ function SV.Setup:SelectTheme() if(count > 1) then SVUI_ThemeSelectFrame:ClearAllPoints() - SVUI_ThemeSelectFrame:ModSize(350, (135 * count) + 20) + SVUI_ThemeSelectFrame:SetSize(350, (135 * count) + 20) SVUI_ThemeSelectFrame:SetPoint("CENTER", SV.Screen, "CENTER", 0, 0) SVUI_ThemeSelectFrame:Show() else diff --git a/SVUI_!Core/system/_docklets/breakstuff.lua b/SVUI_!Core/system/_docklets/breakstuff.lua index c869228..7119098 100644 --- a/SVUI_!Core/system/_docklets/breakstuff.lua +++ b/SVUI_!Core/system/_docklets/breakstuff.lua @@ -330,8 +330,8 @@ local function LoadToolBreakStuff() BreakStuffButton:SetParent(MOD.BottomRight.Bar.ToolBar) local size = MOD.BottomRight.Bar.ToolBar:GetHeight() - BreakStuffButton:ModSize(size, size) - BreakStuffButton:ModPoint("RIGHT", MOD.BottomRight.Bar.ToolBar, "LEFT", -6, 0) + BreakStuffButton:SetSize(size, size) + BreakStuffButton:SetPoint("RIGHT", MOD.BottomRight.Bar.ToolBar, "LEFT", -6, 0) BreakStuffButton.icon:SetTexture(SV.media.dock.breakStuffIcon) BreakStuffButton:Show(); BreakStuffButton:SetStyle("DockButton") diff --git a/SVUI_!Core/system/_docklets/raidleader.lua b/SVUI_!Core/system/_docklets/raidleader.lua index 174c617..33b74b8 100644 --- a/SVUI_!Core/system/_docklets/raidleader.lua +++ b/SVUI_!Core/system/_docklets/raidleader.lua @@ -74,9 +74,9 @@ end local function NewToolButton(name, parent, template, width, height, point, relativeto, point2, xOfs, yOfs, textDisplay) local button = CreateFrame("Button", name, parent, template) button:RemoveTextures() - button:ModWidth(width) - button:ModHeight(height) - button:ModPoint(point, relativeto, point2, xOfs, yOfs) + button:SetWidth(width) + button:SetHeight(height) + button:SetPoint(point, relativeto, point2, xOfs, yOfs) button:SetStyle("DockButton") if(textDisplay) then @@ -124,8 +124,8 @@ function MOD:LoadRaidLeaderTools() self.RaidTool.Menu = CreateFrame("Frame", "SVUI_RaidToolMenu", self.RaidTool, "SecureHandlerClickTemplate"); self.RaidTool.Menu:SetStyle("Frame", 'Transparent'); - self.RaidTool.Menu:ModWidth(120); - self.RaidTool.Menu:ModHeight(140); + self.RaidTool.Menu:SetWidth(120); + self.RaidTool.Menu:SetHeight(140); self.RaidTool.Menu:SetPoint("TOPLEFT", dock.ToolBar, "BOTTOMLEFT", 0, -2); self.RaidTool.Menu:SetFrameLevel(3); self.RaidTool.Menu.toggled = false; @@ -202,7 +202,7 @@ function MOD:LoadRaidLeaderTools() markerButton:ClearAllPoints() markerButton:SetPoint("TOP", control, "BOTTOM", 0, -5) markerButton:SetParent(self.RaidTool.Menu) - markerButton:ModHeight(18) + markerButton:SetHeight(18) markerButton:SetWidth(109) markerButton:RemoveTextures() markerButton:SetStyle("DockButton") diff --git a/SVUI_!Core/system/alerts.lua b/SVUI_!Core/system/alerts.lua index 9c6bd68..3336664 100644 --- a/SVUI_!Core/system/alerts.lua +++ b/SVUI_!Core/system/alerts.lua @@ -852,9 +852,9 @@ local AlertFramePostMove_Hook = function(forced) for index, rollFrame in pairs(SV.RollFrames) do rollFrame:ClearAllPoints() if(POSITION == "TOP") then - rollFrame:ModPoint("TOP", lastFrame, "BOTTOM", 0, -4) + rollFrame:SetPoint("TOP", lastFrame, "BOTTOM", 0, -4) else - rollFrame:ModPoint("BOTTOM", lastFrame, "TOP", 0, 4) + rollFrame:SetPoint("BOTTOM", lastFrame, "TOP", 0, 4) end lastFrame = rollFrame; if(rollFrame:IsShown()) then @@ -942,13 +942,13 @@ local function LoadSystemAlerts() local configAlert = CreateFrame("Frame", "SVUI_ConfigAlert", UIParent) configAlert:SetFrameStrata("TOOLTIP") configAlert:SetFrameLevel(979) - configAlert:ModSize(300, 300) - configAlert:ModPoint("CENTER", 200, -150) + configAlert:SetSize(300, 300) + configAlert:SetPoint("CENTER", 200, -150) configAlert:Hide() configAlert.bg = CreateFrame("Frame", nil, configAlert) - configAlert.bg:ModSize(300, 300) - configAlert.bg:ModPoint("CENTER") + configAlert.bg:SetSize(300, 300) + configAlert.bg:SetPoint("CENTER") configAlert.bg:SetFrameStrata("TOOLTIP") configAlert.bg:SetFrameLevel(979) local bgtex = configAlert.bg:CreateTexture(nil, "BACKGROUND") @@ -957,8 +957,8 @@ local function LoadSystemAlerts() SetConfigAlertAnim(configAlert.bg) configAlert.fg = CreateFrame("Frame", nil, configAlert) - configAlert.fg:ModSize(300, 300) - configAlert.fg:ModPoint("CENTER", bgtex, "CENTER") + configAlert.fg:SetSize(300, 300) + configAlert.fg:SetPoint("CENTER", bgtex, "CENTER") configAlert.fg:SetFrameStrata("TOOLTIP") configAlert.fg:SetFrameLevel(999) local fgtex = configAlert.fg:CreateTexture(nil, "ARTWORK") @@ -995,7 +995,7 @@ local function LoadSystemAlerts() _G["SVUI_SystemAlert"..i.."ItemFrameIconTexture"]:InsetPoints() end - SVUI_AlertFrame:ModSize(180, 20); + SVUI_AlertFrame:SetSize(180, 20); SVUI_AlertFrame.callbackOnEnter = true; SV:NewAnchor(SVUI_AlertFrame, L["Loot / Alert Frames"], nil, AlertFramePostMove_Hook, nil) diff --git a/SVUI_!Core/system/api.lua b/SVUI_!Core/system/api.lua index bb2ce1e..92442ff 100644 --- a/SVUI_!Core/system/api.lua +++ b/SVUI_!Core/system/api.lua @@ -167,29 +167,6 @@ end APPENDED POSITIONING METHODS ########################################################## ]]-- -local function _scale(value) - return SCREEN_MOD * floor(value / SCREEN_MOD + .5); -end - -local ModSize = function(self, width, height) - if(type(width) == "number") then - local h = (height and type(height) == "number") and height or width - self:SetSize(_scale(width), _scale(h)) - end -end - -local ModWidth = function(self, width) - if(type(width) == "number") then - self:SetWidth(_scale(width)) - end -end - -local ModHeight = function(self, height) - if(type(height) == "number") then - self:SetHeight(_scale(height)) - end -end - local WrapPoints = function(self, parent, x, y) x = type(x) == "number" and x or 1 y = y or x @@ -211,16 +188,6 @@ local InsetPoints = function(self, parent, x, y) self:SetPoint("TOPLEFT", parent, "TOPLEFT", x, -y) self:SetPoint("BOTTOMRIGHT", parent, "BOTTOMRIGHT", -x, y) end - -local ModPoint= function(self, ...) - for i = 1, select('#', ...) do - local arg = select(i, ...) - if(arg and type(arg) == "number") then - arg = _scale(arg) - end - end - self:SetPoint(...) -end --[[ ########################################################## APPENDED DESTROY METHODS @@ -1401,10 +1368,6 @@ local function AppendFrameMethods(OBJECT) local META = getmetatable(OBJECT).__index if not OBJECT.SetStyle then META.SetStyle = SetStyle end if not OBJECT.SetPanelColor then META.SetPanelColor = SetPanelColor end - if not OBJECT.ModSize then META.ModSize = ModSize end - if not OBJECT.ModWidth then META.ModWidth = ModWidth end - if not OBJECT.ModHeight then META.ModHeight = ModHeight end - if not OBJECT.ModPoint then META.ModPoint = ModPoint end if not OBJECT.WrapPoints then META.WrapPoints = WrapPoints end if not OBJECT.InsetPoints then META.InsetPoints = InsetPoints end if not OBJECT.Die then META.Die = Die end @@ -1418,10 +1381,6 @@ end local function AppendTextureMethods(OBJECT) local META = getmetatable(OBJECT).__index - if not OBJECT.ModSize then META.ModSize = ModSize end - if not OBJECT.ModWidth then META.ModWidth = ModWidth end - if not OBJECT.ModHeight then META.ModHeight = ModHeight end - if not OBJECT.ModPoint then META.ModPoint = ModPoint end if not OBJECT.WrapPoints then META.WrapPoints = WrapPoints end if not OBJECT.InsetPoints then META.InsetPoints = InsetPoints end if not OBJECT.Die then META.Die = Die end @@ -1432,10 +1391,6 @@ end local function AppendFontStringMethods(OBJECT) local META = getmetatable(OBJECT).__index - if not OBJECT.ModSize then META.ModSize = ModSize end - if not OBJECT.ModWidth then META.ModWidth = ModWidth end - if not OBJECT.ModHeight then META.ModHeight = ModHeight end - if not OBJECT.ModPoint then META.ModPoint = ModPoint end if not OBJECT.WrapPoints then META.WrapPoints = WrapPoints end if not OBJECT.InsetPoints then META.InsetPoints = InsetPoints end end @@ -1665,7 +1620,7 @@ MOD.Concepts["PageButton"] = function(self, adjustable, frame, isVertical, isLef if not frame.icon then frame.icon = frame:CreateTexture(nil,'ARTWORK') - frame.icon:ModSize(13) + frame.icon:SetSize(13) frame.icon:SetPoint('CENTER') frame.icon:SetTexture(SV.media.button.radio) frame.icon:SetTexCoord(0.02, 0.2, 0.02, 0.2) @@ -1727,7 +1682,7 @@ MOD.Concepts["ScrollFrame"] = function(self, adjustable, frame, scale, yOffset) local upW, upH = upButton:GetSize() self.Concepts["PageButton"](self, false, upButton) SquareButton_SetIcon(upButton, "UP") - upButton:ModSize(upW + scale, upH + scale) + upButton:SetSize(upW + scale, upH + scale) if(yOffset) then local anchor, parent, relative, xBase, yBase = upButton:GetPoint() local yAdjust = (yOffset or 0) + yBase @@ -1740,7 +1695,7 @@ MOD.Concepts["ScrollFrame"] = function(self, adjustable, frame, scale, yOffset) local dnW, dnH = downButton:GetSize() self.Concepts["PageButton"](self, false, downButton) SquareButton_SetIcon(downButton, "DOWN") - downButton:ModSize(dnW + scale, dnH + scale) + downButton:SetSize(dnW + scale, dnH + scale) if(yOffset) then local anchor, parent, relative, xBase, yBase = downButton:GetPoint() local yAdjust = ((yOffset or 0) * -1) + yBase diff --git a/SVUI_!Core/system/dock.lua b/SVUI_!Core/system/dock.lua index 87d3bbc..a4888bc 100644 --- a/SVUI_!Core/system/dock.lua +++ b/SVUI_!Core/system/dock.lua @@ -108,9 +108,9 @@ function MOD.SetThemeDockStyle(frame, isBottom) local left = backdrop:CreateTexture(nil, "OVERLAY") left:SetTexture(1, 1, 1, 1) - left:ModPoint("TOPLEFT", 1, -1) - left:ModPoint("BOTTOMLEFT", -1, -1) - left:ModWidth(2) + left:SetPoint("TOPLEFT", 1, -1) + left:SetPoint("BOTTOMLEFT", -1, -1) + left:SetWidth(2) if(isBottom) then left:SetGradientAlpha("VERTICAL", 0, 0, 0, 1, 0, 0, 0, 0) else @@ -119,9 +119,9 @@ function MOD.SetThemeDockStyle(frame, isBottom) local right = backdrop:CreateTexture(nil, "OVERLAY") right:SetTexture(1, 1, 1, 1) - right:ModPoint("TOPRIGHT", -1, -1) - right:ModPoint("BOTTOMRIGHT", -1, -1) - right:ModWidth(2) + right:SetPoint("TOPRIGHT", -1, -1) + right:SetPoint("BOTTOMRIGHT", -1, -1) + right:SetWidth(2) if(isBottom) then right:SetGradientAlpha("VERTICAL", 0, 0, 0, 1, 0, 0, 0, 0) else @@ -129,36 +129,36 @@ function MOD.SetThemeDockStyle(frame, isBottom) end local bottom = backdrop:CreateTexture(nil, "OVERLAY") - bottom:ModPoint("BOTTOMLEFT", 1, -1) - bottom:ModPoint("BOTTOMRIGHT", -1, -1) + bottom:SetPoint("BOTTOMLEFT", 1, -1) + bottom:SetPoint("BOTTOMRIGHT", -1, -1) if(isBottom) then bottom:SetTexture(0, 0, 0, 1) - bottom:ModHeight(2) + bottom:SetHeight(2) else bottom:SetTexture(0, 0, 0, 0) bottom:SetAlpha(0) - bottom:ModHeight(1) + bottom:SetHeight(1) end local top = backdrop:CreateTexture(nil, "OVERLAY") - top:ModPoint("TOPLEFT", 1, -1) - top:ModPoint("TOPRIGHT", -1, 1) + top:SetPoint("TOPLEFT", 1, -1) + top:SetPoint("TOPRIGHT", -1, 1) if(isBottom) then top:SetTexture(0, 0, 0, 0) top:SetAlpha(0) - top:ModHeight(1) + top:SetHeight(1) else top:SetTexture(0, 0, 0, 1) - top:ModHeight(2) + top:SetHeight(2) end return backdrop end function MOD:SetBorderTheme() - self.Border.Top:ModPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) - self.Border.Top:ModPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) - self.Border.Top:ModHeight(10) + self.Border.Top:SetPoint("TOPLEFT", SV.Screen, "TOPLEFT", -1, 1) + self.Border.Top:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", 1, 1) + self.Border.Top:SetHeight(10) self.Border.Top:SetBackdrop({ bgFile = SV.media.background.button, edgeFile = [[Interface\BUTTONS\WHITE8X8]], @@ -176,9 +176,9 @@ function MOD:SetBorderTheme() self:SetFrameStrata('BACKGROUND') end) - self.Border.Bottom:ModPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) - self.Border.Bottom:ModPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) - self.Border.Bottom:ModHeight(10) + self.Border.Bottom:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", -1, -1) + self.Border.Bottom:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOMRIGHT", 1, -1) + self.Border.Bottom:SetHeight(10) self.Border.Bottom:SetBackdrop({ bgFile = SV.media.background.button, edgeFile = [[Interface\BUTTONS\WHITE8X8]], @@ -204,7 +204,7 @@ function MOD:SetButtonTheme(button, size) button:SetStyle("DockButton") local sparks = button:CreateTexture(nil, "OVERLAY", nil, 2) - sparks:ModSize(sparkSize, sparkSize) + sparks:SetSize(sparkSize, sparkSize) sparks:SetPoint("CENTER", button, "BOTTOMRIGHT", -sparkOffset, 4) sparks:SetTexture(SV.media.dock.sparks[1]) sparks:SetVertexColor(0.7, 0.6, 0.5) @@ -439,7 +439,7 @@ end local AlertActivate = function(self, child) local size = SV.db.Dock.buttonSize or 22; - self:ModHeight(size) + self:SetHeight(size) self.backdrop:Show() child:ClearAllPoints() child:SetAllPoints(self) @@ -447,7 +447,7 @@ end local AlertDeactivate = function(self) self.backdrop:Hide() - self:ModHeight(1) + self:SetHeight(1) end local Docklet_OnShow = function(self) @@ -626,7 +626,7 @@ local DockletRelocate = function(self, location) local spacing = SV.db.Dock.buttonSpacing; self.Bar:ClearAllPoints(); - self.Bar:ModPoint(barAnchor, newParent.Bar.ToolBar, barReverse, (spacing * mod), 0) + self.Bar:SetPoint(barAnchor, newParent.Bar.ToolBar, barReverse, (spacing * mod), 0) end end @@ -1075,7 +1075,7 @@ function MOD:NewAdvancedDocklet(location, globalName) frame.Bar = CreateFrame("Frame", nil, newParent); frame.Bar:SetSize(1, height); - frame.Bar:ModPoint(barAnchor, newParent.Bar.ToolBar, barReverse, (spacing * mod), 0) + frame.Bar:SetPoint(barAnchor, newParent.Bar.ToolBar, barReverse, (spacing * mod), 0) SV:NewAnchor(frame.Bar, globalName .. " Dock Bar"); DOCK_REGISTRY[globalName] = frame; @@ -1275,11 +1275,11 @@ function MOD:Load() self:SetButtonTheme(dock.Bar.Button, buttonsize) dock.Bar.Button.Icon:SetTexture(SV.media.icon.default) dock.Bar.ToolBar:SetSize(1, buttonsize) - dock.Bar.ToolBar:ModPoint(barAnchor, dock.Bar.Button, barReverse, (spacing * mod), 0) + dock.Bar.ToolBar:SetPoint(barAnchor, dock.Bar.Button, barReverse, (spacing * mod), 0) InitDockButton(dock.Bar.Button, location) else dock.Bar.ToolBar:SetSize(1, buttonsize) - dock.Bar.ToolBar:ModPoint(barAnchor, dock.Bar, barAnchor, 0, 0) + dock.Bar.ToolBar:SetPoint(barAnchor, dock.Bar, barAnchor, 0, 0) end dock:SetParent(SV.Screen) diff --git a/SVUI_!Core/system/gear.lua b/SVUI_!Core/system/gear.lua index 04c7d83..98a489a 100644 --- a/SVUI_!Core/system/gear.lua +++ b/SVUI_!Core/system/gear.lua @@ -137,19 +137,19 @@ local function SetDisplayStats(arg) if(flags[1]) then frame.ItemLevel = frame:CreateFontString(nil, "OVERLAY") - frame.ItemLevel:ModPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 2, 1) + frame.ItemLevel:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 2, 1) frame.ItemLevel:SetFontObject(SVUI_Font_Default) end if(arg == "Character" and flags[2]) then frame.DurabilityInfo = CreateFrame("Frame", nil, frame) - frame.DurabilityInfo:ModWidth(7) + frame.DurabilityInfo:SetWidth(7) if flags[3] then - frame.DurabilityInfo:ModPoint("TOPRIGHT", frame, "TOPLEFT", -1, 1) - frame.DurabilityInfo:ModPoint("BOTTOMRIGHT", frame, "BOTTOMLEFT", -1, -1) + frame.DurabilityInfo:SetPoint("TOPRIGHT", frame, "TOPLEFT", -1, 1) + frame.DurabilityInfo:SetPoint("BOTTOMRIGHT", frame, "BOTTOMLEFT", -1, -1) else - frame.DurabilityInfo:ModPoint("TOPLEFT", frame, "TOPRIGHT", 1, 1) - frame.DurabilityInfo:ModPoint("BOTTOMLEFT", frame, "BOTTOMRIGHT", 1, -1) + frame.DurabilityInfo:SetPoint("TOPLEFT", frame, "TOPRIGHT", 1, 1) + frame.DurabilityInfo:SetPoint("BOTTOMLEFT", frame, "BOTTOMRIGHT", 1, -1) end frame.DurabilityInfo:SetFrameLevel(frame:GetFrameLevel()-1) frame.DurabilityInfo:SetBackdrop(SV.media.backdrop.glow) diff --git a/SVUI_!Core/system/henchmen.lua b/SVUI_!Core/system/henchmen.lua index 23f3b3e..ea16f84 100644 --- a/SVUI_!Core/system/henchmen.lua +++ b/SVUI_!Core/system/henchmen.lua @@ -186,9 +186,9 @@ local function CreateMinionOptions(i) option:SetSize(148,50) if i==1 then - option:ModPoint("TOPRIGHT",HenchmenFrame,"TOPLEFT",-32,-32) + option:SetPoint("TOPRIGHT",HenchmenFrame,"TOPLEFT",-32,-32) else - option:ModPoint("TOP",_G["MinionOptionButton"..lastIndex],"BOTTOM",offsetX,-32) + option:SetPoint("TOP",_G["MinionOptionButton"..lastIndex],"BOTTOM",offsetX,-32) end local setting = options[4]; @@ -226,7 +226,7 @@ local function CreateMinionOptions(i) option.ttText = options[3] option.indicator = option:CreateTexture(nil,"OVERLAY") option.indicator:SetSize(100,32) - option.indicator:ModPoint("RIGHT", option , "LEFT", -5, 0) + option.indicator:SetPoint("RIGHT", option , "LEFT", -5, 0) option.indicator:SetTexture(SWITCH) if(not dbSet) then option.indicator:SetTexCoord(0,1,0,0.5) @@ -246,9 +246,9 @@ local function CreateHenchmenOptions(i) local option = CreateFrame("Frame", "HenchmenOptionButton"..i, HenchmenFrame) option:SetSize(148,50) if i==1 then - option:ModPoint("TOPLEFT",HenchmenFrame,"TOPRIGHT",32,-32) + option:SetPoint("TOPLEFT",HenchmenFrame,"TOPRIGHT",32,-32) else - option:ModPoint("TOP",_G["HenchmenOptionButton"..lastIndex],"BOTTOM",offsetX,-32) + option:SetPoint("TOP",_G["HenchmenOptionButton"..lastIndex],"BOTTOM",offsetX,-32) end SV.Animate:Slide(option,500,-500) option:SetFrameStrata("DIALOG") @@ -285,7 +285,7 @@ local function CreateHenchmenSubOptions(buttonIndex,optionIndex) local yOffset = 180 - calc; local frame = CreateFrame("Frame",name,HenchmenFrame) frame:SetSize(122,50) - frame:ModPoint("BOTTOMLEFT", parent, "TOPRIGHT", 75, yOffset) + frame:SetPoint("BOTTOMLEFT", parent, "TOPRIGHT", 75, yOffset) frame:SetFrameStrata("DIALOG") frame:SetFrameLevel(24) frame:EnableMouse(true) diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua index 8072558..c1d541e 100644 --- a/SVUI_!Core/system/layout.lua +++ b/SVUI_!Core/system/layout.lua @@ -477,9 +477,9 @@ end function Layout:Movable_OnSizeChanged() if InCombatLockdown()then return end if self.dirtyWidth and self.dirtyHeight then - self.Grip:ModSize(self.dirtyWidth, self.dirtyHeight) + self.Grip:SetSize(self.dirtyWidth, self.dirtyHeight) else - self.Grip:ModSize(self:GetSize()) + self.Grip:SetSize(self:GetSize()) end end @@ -525,11 +525,11 @@ function Layout:Movable_OnDragStop() end if self.positionOverride then self.parent:ClearAllPoints() - self.parent:ModPoint(self.positionOverride, self, self.positionOverride) + self.parent:SetPoint(self.positionOverride, self, self.positionOverride) end self:ClearAllPoints() - self:ModPoint(newAnchor, SV.Screen, newAnchor, cX, cY) + self:SetPoint(newAnchor, SV.Screen, newAnchor, cX, cY) SaveAnchor(self.name) @@ -923,7 +923,7 @@ local XML_LayoutPrecisionInputX_EnterPressed = function(self) local xOffset, yOffset, anchor = CalculateOffsets() yOffset = tonumber(SVUI_LayoutPrecisionSetY.CurrentValue) CurrentFrameTarget:ClearAllPoints() - CurrentFrameTarget:ModPoint(anchor, SVUIParent, anchor, current, yOffset) + CurrentFrameTarget:SetPoint(anchor, SVUIParent, anchor, current, yOffset) SaveAnchor(CurrentFrameTarget.name) end self.CurrentValue = current @@ -939,7 +939,7 @@ local XML_LayoutPrecisionInputY_EnterPressed = function(self) local xOffset, yOffset, anchor = CalculateOffsets() xOffset = tonumber(SVUI_LayoutPrecisionSetX.CurrentValue) CurrentFrameTarget:ClearAllPoints() - CurrentFrameTarget:ModPoint(anchor, SVUIParent, anchor, xOffset, current) + CurrentFrameTarget:SetPoint(anchor, SVUIParent, anchor, xOffset, current) SaveAnchor(CurrentFrameTarget.name) end self.CurrentValue = current @@ -1201,7 +1201,7 @@ local function InitializeMovables() Layout.Portrait:SetTexture([[Interface\AddOns\SVUI_!Core\assets\textures\Doodads\MENTALO-OFF]]) - SVUI_LayoutLockButton:ModSize(110, 25) + SVUI_LayoutLockButton:SetSize(110, 25) SVUI_LayoutLockButton.Left:SetAlpha(0) SVUI_LayoutLockButton.Middle:SetAlpha(0) SVUI_LayoutLockButton.Right:SetAlpha(0) @@ -1212,7 +1212,7 @@ local function InitializeMovables() SVUI_LayoutLockButton:RemoveTextures() SVUI_LayoutLockButton:SetFrameLevel(SVUI_LayoutLockButton:GetFrameLevel() + 1) SVUI_LayoutLockButton.texture = SVUI_LayoutLockButton:CreateTexture(nil, "BORDER") - SVUI_LayoutLockButton.texture:ModSize(110, 50) + SVUI_LayoutLockButton.texture:SetSize(110, 50) SVUI_LayoutLockButton.texture:SetPoint("CENTER", SVUI_LayoutLockButton, "CENTER", 0, -4) SVUI_LayoutLockButton.texture:SetTexture([[Interface\AddOns\SVUI_!Core\assets\textures\Doodads\QUESTION]]) SVUI_LayoutLockButton.texture:SetVertexColor(1, 1, 1) @@ -1232,7 +1232,7 @@ local function InitializeMovables() end) SVUI_LayoutLockButton:SetScript("OnClick", XML_LayoutLockButton_OnClick) - SVUI_LayoutGridButton:ModSize(110, 25) + SVUI_LayoutGridButton:SetSize(110, 25) SVUI_LayoutGridButton.Left:SetAlpha(0) SVUI_LayoutGridButton.Middle:SetAlpha(0) SVUI_LayoutGridButton.Right:SetAlpha(0) @@ -1243,7 +1243,7 @@ local function InitializeMovables() SVUI_LayoutGridButton:RemoveTextures() SVUI_LayoutGridButton:SetFrameLevel(SVUI_LayoutGridButton:GetFrameLevel() + 1) SVUI_LayoutGridButton.texture = SVUI_LayoutGridButton:CreateTexture(nil, "BORDER") - SVUI_LayoutGridButton.texture:ModSize(110, 50) + SVUI_LayoutGridButton.texture:SetSize(110, 50) SVUI_LayoutGridButton.texture:SetPoint("CENTER", SVUI_LayoutGridButton, "CENTER", 0, -4) SVUI_LayoutGridButton.texture:SetTexture([[Interface\AddOns\SVUI_!Core\assets\textures\Doodads\QUESTION]]) SVUI_LayoutGridButton.texture:SetVertexColor(1, 1, 1) diff --git a/SVUI_!Core/system/misc.lua b/SVUI_!Core/system/misc.lua index 59874fb..0b75a31 100644 --- a/SVUI_!Core/system/misc.lua +++ b/SVUI_!Core/system/misc.lua @@ -221,8 +221,8 @@ do local RaidMarkButton_OnEnter = function(self) self.Texture:ClearAllPoints() - self.Texture:ModPoint("TOPLEFT",-10,10) - self.Texture:ModPoint("BOTTOMRIGHT",10,-10) + self.Texture:SetPoint("TOPLEFT",-10,10) + self.Texture:SetPoint("BOTTOMRIGHT",10,-10) end local RaidMarkButton_OnLeave = function(self) diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua index 4bb455f..691dd15 100644 --- a/SVUI_!Core/system/overrides.lua +++ b/SVUI_!Core/system/overrides.lua @@ -119,16 +119,16 @@ local function MirrorBarRegistry(barType) bar.text:SetTextColor(1, 1, 1) bar.text:SetPoint('LEFT', bar) bar.text:SetPoint('RIGHT', bar) - bar.text:ModPoint('TOP', bar, 0, 2) + bar.text:SetPoint('TOP', bar, 0, 2) bar.text:SetPoint('BOTTOM', bar) - bar:ModSize(222, 18) + bar:SetSize(222, 18) bar:SetStatusBarTexture(SV.media.statusbar.gradient) bar:SetStatusBarColor(r, g, b) bar.type = barType; bar.Start = MirrorBar_Start; local yOffset = mirrorYOffset[bar.type] - bar:ModPoint("TOP", SV.Screen, "TOP", 0, -yOffset) + bar:SetPoint("TOP", SV.Screen, "TOP", 0, -yOffset) RegisteredMirrorBars[barType] = bar; return bar end @@ -315,7 +315,7 @@ local LootRoll_OnUpdate = function(self) if not self.parent.rollID then return end local remaining = GetLootRollTimeLeft(self.parent.rollID) local mu = remaining / self.parent.time; - self.spark:ModPoint("CENTER", self, "LEFT", mu * self:GetWidth(), 0) + self.spark:SetPoint("CENTER", self, "LEFT", mu * self:GetWidth(), 0) self:SetValue(remaining) if remaining > 1000000000 then self:GetParent():Hide() @@ -376,18 +376,18 @@ local function HandleSlots(frame) local slot = frame.slots[i] if slot:IsShown() then counter = counter + 1; - slot:ModPoint("TOP", SVUI_LootFrame, 4, (-8 + scale) - (counter * scale)) + slot:SetPoint("TOP", SVUI_LootFrame, 4, (-8 + scale) - (counter * scale)) end end - frame:ModHeight(max(counter * scale + 16, 20)) + frame:SetHeight(max(counter * scale + 16, 20)) end local function MakeSlots(id) local size = LOOT_HEIGHT; local slot = CreateFrame("Button", "SVUI_LootSlot"..id, SVUI_LootFrame) - slot:ModPoint("LEFT", 8, 0) - slot:ModPoint("RIGHT", -8, 0) - slot:ModHeight(size) + slot:SetPoint("LEFT", 8, 0) + slot:SetPoint("RIGHT", -8, 0) + slot:SetHeight(size) slot:SetID(id) slot:RegisterForClicks("LeftButtonUp", "RightButtonUp") slot:SetScript("OnEnter", LootSlot_OnEnter) @@ -396,8 +396,8 @@ local function MakeSlots(id) slot:SetScript("OnShow", LootSlot_OnShow) slot.iconFrame = CreateFrame("Frame", nil, slot) - slot.iconFrame:ModHeight(size) - slot.iconFrame:ModWidth(size) + slot.iconFrame:SetHeight(size) + slot.iconFrame:SetWidth(size) slot.iconFrame:SetPoint("RIGHT", slot) slot.iconFrame:SetStyle("Frame", "Transparent") @@ -407,7 +407,7 @@ local function MakeSlots(id) slot.count = slot.iconFrame:CreateFontString(nil, "OVERLAY") slot.count:SetJustifyH("RIGHT") - slot.count:ModPoint("BOTTOMRIGHT", slot.iconFrame, -2, 2) + slot.count:SetPoint("BOTTOMRIGHT", slot.iconFrame, -2, 2) slot.count:SetFontObject(SVUI_Font_Loot_Number) slot.count:SetText(1) @@ -437,8 +437,8 @@ end local function CreateRollButton(rollFrame, type, locale, anchor) local preset = RollTypePresets[type]; local rollButton = CreateFrame("Button", nil, rollFrame) - rollButton:ModPoint("LEFT", anchor, "RIGHT", tonumber(preset[4]), tonumber(preset[5])) - rollButton:ModSize(LOOT_HEIGHT - 4) + rollButton:SetPoint("LEFT", anchor, "RIGHT", tonumber(preset[4]), tonumber(preset[5])) + rollButton:SetSize(LOOT_HEIGHT - 4) rollButton:SetNormalTexture(preset[1]) if preset[2] and preset[2] ~= "" then rollButton:SetPushedTexture(preset[2]) @@ -453,21 +453,21 @@ local function CreateRollButton(rollFrame, type, locale, anchor) rollButton:SetMotionScriptsWhileDisabled(true) local text = rollButton:CreateFontString(nil, nil) text:SetFontObject(SVUI_Font_Roll) - text:ModPoint("CENTER", 0, ((type == 2 and 1) or (type == 0 and -1.2) or 0)) + text:SetPoint("CENTER", 0, ((type == 2 and 1) or (type == 0 and -1.2) or 0)) return rollButton, text end local function CreateRollFrame() UpdateLootUpvalues() local rollFrame = CreateFrame("Frame", nil, UIParent) - rollFrame:ModSize(LOOT_WIDTH,LOOT_HEIGHT) + rollFrame:SetSize(LOOT_WIDTH,LOOT_HEIGHT) rollFrame:SetStyle("!_Frame", 'Default') rollFrame:SetScript("OnEvent",LootRoll_OnEvent) rollFrame:RegisterEvent("CANCEL_LOOT_ROLL") rollFrame:Hide() rollFrame.button = CreateFrame("Button",nil,rollFrame) - rollFrame.button:ModPoint("RIGHT",rollFrame,'LEFT',0,0) - rollFrame.button:ModSize(LOOT_HEIGHT - 2) + rollFrame.button:SetPoint("RIGHT",rollFrame,'LEFT',0,0) + rollFrame.button:SetSize(LOOT_HEIGHT - 2) rollFrame.button:SetStyle("Frame", 'Default') rollFrame.button:SetScript("OnEnter",LootItem_SetTooltip) rollFrame.button:SetScript("OnLeave",LootItem_OnLeave) @@ -477,8 +477,8 @@ local function CreateRollFrame() rollFrame.button.icon:SetAllPoints() rollFrame.button.icon:SetTexCoord(0.1,0.9,0.1,0.9 ) local border = rollFrame:CreateTexture(nil,"BORDER") - border:ModPoint("TOPLEFT",rollFrame,"TOPLEFT",4,0) - border:ModPoint("BOTTOMRIGHT",rollFrame,"BOTTOMRIGHT",-4,0) + border:SetPoint("TOPLEFT",rollFrame,"TOPLEFT",4,0) + border:SetPoint("BOTTOMRIGHT",rollFrame,"BOTTOMRIGHT",-4,0) border:SetTexture("Interface\\ChatFrame\\ChatFrameBackground") border:SetBlendMode("ADD") border:SetGradientAlpha("VERTICAL",.1,.1,.1,0,.1,.1,.1,0) @@ -494,7 +494,7 @@ local function CreateRollFrame() rollFrame.status.bg:SetAllPoints() rollFrame.status.bg:SetDrawLayer('BACKGROUND',2) rollFrame.status.spark = rollFrame:CreateTexture(nil,"OVERLAY") - rollFrame.status.spark:ModSize(LOOT_HEIGHT * 0.5, LOOT_HEIGHT) + rollFrame.status.spark:SetSize(LOOT_HEIGHT * 0.5, LOOT_HEIGHT) rollFrame.status.spark:SetTexture("Interface\\CastingBar\\UI-CastingBar-Spark") rollFrame.status.spark:SetBlendMode("ADD") @@ -505,19 +505,19 @@ local function CreateRollFrame() rollFrame.NeedIt,rollFrame.WantIt,rollFrame.BreakIt = needButton,greedButton,deButton; rollFrame.need,rollFrame.greed,rollFrame.pass,rollFrame.disenchant = needText,greedText,passText,deText; rollFrame.bindText = rollFrame:CreateFontString() - rollFrame.bindText:ModPoint("LEFT",passButton,"RIGHT",3,1) + rollFrame.bindText:SetPoint("LEFT",passButton,"RIGHT",3,1) rollFrame.bindText:SetFontObject(SVUI_Font_Roll_Number) rollFrame.lootText = rollFrame:CreateFontString(nil,"ARTWORK") rollFrame.lootText:SetFontObject(SVUI_Font_Roll_Number) - rollFrame.lootText:ModPoint("LEFT",rollFrame.bindText,"RIGHT",0,0) - rollFrame.lootText:ModPoint("RIGHT",rollFrame,"RIGHT",-5,0) - rollFrame.lootText:ModSize(200,10) + rollFrame.lootText:SetPoint("LEFT",rollFrame.bindText,"RIGHT",0,0) + rollFrame.lootText:SetPoint("RIGHT",rollFrame,"RIGHT",-5,0) + rollFrame.lootText:SetSize(200,10) rollFrame.lootText:SetJustifyH("LEFT") rollFrame.yourRoll = rollFrame:CreateFontString(nil,"ARTWORK") rollFrame.yourRoll:SetFontObject(SVUI_Font_Roll_Number) - rollFrame.yourRoll:ModSize(22,22) - rollFrame.yourRoll:ModPoint("LEFT",rollFrame,"RIGHT",5,0) + rollFrame.yourRoll:SetSize(22,22) + rollFrame.yourRoll:SetPoint("LEFT",rollFrame,"RIGHT",5,0) rollFrame.yourRoll:SetJustifyH("CENTER") rollFrame.rolls = {} @@ -531,7 +531,7 @@ local function FetchRollFrame() end end local roll = CreateRollFrame() - roll:ModPoint("TOP", next(SV.RollFrames) and SV.RollFrames[#SV.RollFrames] or SVUI_AlertFrame, "BOTTOM", 0, -4); + roll:SetPoint("TOP", next(SV.RollFrames) and SV.RollFrames[#SV.RollFrames] or SVUI_AlertFrame, "BOTTOM", 0, -4); tinsert(SV.RollFrames, roll) return roll end @@ -744,7 +744,7 @@ EventFunc["LOOT_READY"] = function(autoLoot) titleWidth = titleWidth + 5; local color = ITEM_QUALITY_COLORS[iQuality] SVUI_LootFrame:SetBackdropBorderColor(color.r, color.g, color.b, .8) - SVUI_LootFrame:ModWidth(max(nameWidth, titleWidth)) + SVUI_LootFrame:SetWidth(max(nameWidth, titleWidth)) end local LootFrame_OnEvent = function(self, event, ...) @@ -834,7 +834,7 @@ local CaptureBarHandler = function() local captureBar = _G["WorldStateCaptureBar"..i] if(captureBar and captureBar:IsVisible()) then captureBar:ClearAllPoints() - captureBar:ModPoint("TOP", lastFrame, "TOP", 0, offset) + captureBar:SetPoint("TOP", lastFrame, "TOP", 0, offset) lastFrame = captureBar offset = (-45 * i); end @@ -846,9 +846,9 @@ local Vehicle_OnSetPoint = function(self, _, parent) if(parent == "MinimapCluster" or parent == _G["MinimapCluster"]) then VehicleSeatIndicator:ClearAllPoints() if _G.VehicleSeatIndicator_MOVE then - VehicleSeatIndicator:ModPoint("BOTTOM", VehicleSeatIndicator_MOVE, "BOTTOM", 0, 0) + VehicleSeatIndicator:SetPoint("BOTTOM", VehicleSeatIndicator_MOVE, "BOTTOM", 0, 0) else - VehicleSeatIndicator:ModPoint("TOPLEFT", SV.Dock.TopLeft, "TOPLEFT", 0, 0) + VehicleSeatIndicator:SetPoint("TOPLEFT", SV.Dock.TopLeft, "TOPLEFT", 0, 0) SV:NewAnchor(VehicleSeatIndicator, L["Vehicle Seat Frame"]) end VehicleSeatIndicator:SetScale(0.8) @@ -858,7 +858,7 @@ end local Dura_OnSetPoint = function(self, _, parent) if((parent == "MinimapCluster") or (parent == _G["MinimapCluster"])) then self:ClearAllPoints() - self:ModPoint("RIGHT", Minimap, "RIGHT") + self:SetPoint("RIGHT", Minimap, "RIGHT") self:SetScale(0.6) end end @@ -953,11 +953,11 @@ local function SetOverrides() NewHook(VehicleSeatIndicator, "SetPoint", Vehicle_OnSetPoint) VehicleSeatIndicator:SetPoint("TOPLEFT", MinimapCluster, "TOPLEFT", 2, 2) - SVUI_WorldStateHolder:ModSize(200, 45) + SVUI_WorldStateHolder:SetSize(200, 45) SV:NewAnchor(SVUI_WorldStateHolder, L["Capture Bars"]) NewHook("UIParent_ManageFramePositions", CaptureBarHandler) - SVUI_AltPowerBar:ModSize(128, 50) + SVUI_AltPowerBar:SetSize(128, 50) PlayerPowerBarAlt:SetParent(SVUI_AltPowerBar) PlayerPowerBarAlt:ClearAllPoints() PlayerPowerBarAlt:SetPoint("CENTER", SVUI_AltPowerBar, "CENTER", 0, 0) @@ -986,8 +986,8 @@ local function SetOverrides() SVUI_BailOut:Hide() LossOfControlFrame:ClearAllPoints() - LossOfControlFrame:ModSize(75, 75) - LossOfControlFrame:ModPoint("CENTER", SV.Screen, "CENTER", -146, -40) + LossOfControlFrame:SetSize(75, 75) + LossOfControlFrame:SetPoint("CENTER", SV.Screen, "CENTER", -146, -40) SV:NewAnchor(LossOfControlFrame, L["Loss Control Icon"], nil, nil, "LoC") SV:RegisterEvent("CHAT_MSG_BG_SYSTEM_HORDE", PVPRaidNoticeHandler) @@ -1007,10 +1007,10 @@ local function SetOverrides() UIPARENT_MANAGED_FRAME_POSITIONS["GroupLootContainer"] = nil; LootFrame:UnregisterAllEvents(); - SVUI_LootFrameHolder:ModSize(150, 22); + SVUI_LootFrameHolder:SetSize(150, 22); SV:NewAnchor(SVUI_LootFrameHolder, L["Loot Frame"], nil, nil, "SVUI_LootFrame"); - SVUI_LootFrame:ModSize(256, 64); + SVUI_LootFrame:SetSize(256, 64); SVUI_LootFrame:SetStyle("!_Frame", 'Transparent'); SVUI_LootFrame.title:SetFontObject(SVUI_Font_Header) SV:ManageVisibility(SVUI_LootFrame); diff --git a/SVUI_!Core/system/reports.lua b/SVUI_!Core/system/reports.lua index 318978f..730028d 100644 --- a/SVUI_!Core/system/reports.lua +++ b/SVUI_!Core/system/reports.lua @@ -138,12 +138,12 @@ local UpdateAnchor = function() end for i = 1, numPoints do - slots[i]:ModWidth(width) - slots[i]:ModHeight(height) + slots[i]:SetWidth(width) + slots[i]:SetHeight(height) if(i == 1) then - slots[i]:ModPoint(point1, parent, point1, x, y) + slots[i]:SetPoint(point1, parent, point1, x, y) else - slots[i]:ModPoint(point1, slots[i - 1], point2, x, y) + slots[i]:SetPoint(point1, slots[i - 1], point2, x, y) end end end @@ -218,16 +218,16 @@ local function GetDataSlot(parent, index) slot:SetStyle(parent.Stats.templateType, parent.Stats.templateName, false, 2, 0, 0) if(not SV.db.Reports.backdrop) then - slot.barframe:ModPoint("TOPLEFT", slot, "TOPLEFT", 24, 2) - slot.barframe:ModPoint("BOTTOMRIGHT", slot, "BOTTOMRIGHT", 2, -2) + slot.barframe:SetPoint("TOPLEFT", slot, "TOPLEFT", 24, 2) + slot.barframe:SetPoint("BOTTOMRIGHT", slot, "BOTTOMRIGHT", 2, -2) slot.barframe.bg = slot.barframe:CreateTexture(nil, "BORDER") slot.barframe.bg:InsetPoints(slot.barframe, 2, 2) slot.barframe.bg:SetTexture([[Interface\BUTTONS\WHITE8X8]]) slot.barframe.bg:SetGradient(unpack(SV.media.gradient.dark)) slot.Panel:Hide() else - slot.barframe:ModPoint("TOPLEFT", slot, "TOPLEFT", 24, -2) - slot.barframe:ModPoint("BOTTOMRIGHT", slot, "BOTTOMRIGHT", -2, 2) + slot.barframe:SetPoint("TOPLEFT", slot, "TOPLEFT", 24, -2) + slot.barframe:SetPoint("BOTTOMRIGHT", slot, "BOTTOMRIGHT", -2, 2) slot.Panel:Show() end @@ -244,8 +244,8 @@ local function GetDataSlot(parent, index) slot.barframe:SetBackdropBorderColor(0, 0, 0, 0.8) slot.barframe.icon = CreateFrame("Frame", nil, slot.barframe) - slot.barframe.icon:ModPoint("TOPLEFT", slot, "TOPLEFT", 0, 6) - slot.barframe.icon:ModPoint("BOTTOMRIGHT", slot, "BOTTOMLEFT", 26, -6) + slot.barframe.icon:SetPoint("TOPLEFT", slot, "TOPLEFT", 0, 6) + slot.barframe.icon:SetPoint("BOTTOMRIGHT", slot, "BOTTOMLEFT", 26, -6) slot.barframe.icon.texture = slot.barframe.icon:CreateTexture(nil, "OVERLAY") slot.barframe.icon.texture:InsetPoints(slot.barframe.icon, 2, 2) slot.barframe.icon.texture:SetTexture("") @@ -628,9 +628,9 @@ function MOD:NewHolder(parent, maxCount, tipAnchor, pvpSet, customTemplate, isVe for i = 1, maxCount do local slot = GetDataSlot(parent, i) if(i == 1) then - parent.Stats.Slots[i]:ModPoint(point1, parent, point1, x, y) + parent.Stats.Slots[i]:SetPoint(point1, parent, point1, x, y) else - parent.Stats.Slots[i]:ModPoint(point1, parent.Stats.Slots[i - 1], point2, x, y) + parent.Stats.Slots[i]:SetPoint(point1, parent.Stats.Slots[i - 1], point2, x, y) end end diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua index 544a1fd..4e9c35e 100644 --- a/SVUI_ActionBars/SVUI_ActionBars.lua +++ b/SVUI_ActionBars/SVUI_ActionBars.lua @@ -637,7 +637,7 @@ do lastRow = bar.buttons[i - cols] button:SetParent(bar) button:ClearAllPoints() - button:ModSize(size) + button:SetSize(size) button:SetAttribute("showgrid",1) if(SELF_CASTING) then @@ -664,7 +664,7 @@ do elseif(point:find("LEFT")) then x = space end - button:ModPoint(point,bar,point,x,y) + button:SetPoint(point,bar,point,x,y) elseif((i - 1) % cols == 0) then x, y = 0, -space anchor1, anchor2 = "TOP", "BOTTOM" @@ -673,7 +673,7 @@ do anchor1 = "BOTTOM" anchor2 = "TOP" end - button:ModPoint(anchor1,lastRow,anchor2,x,y) + button:SetPoint(anchor1,lastRow,anchor2,x,y) else x, y = space, 0 anchor1, anchor2 = "LEFT", "RIGHT"; @@ -682,7 +682,7 @@ do anchor1 = "RIGHT" anchor2 = "LEFT" end - button:ModPoint(anchor1,lastButton,anchor2,x,y) + button:SetPoint(anchor1,lastButton,anchor2,x,y) end if(i > totalButtons) then @@ -764,8 +764,8 @@ do if max < cols then cols = max end if rows < 1 then rows = 1 end bar.maxButtons = max; - bar:ModWidth(space + (size * cols) + ((space * (cols - 1)) + space)); - bar:ModHeight((space + (size * rows)) + ((space * (rows - 1)) + space)); + bar:SetWidth(space + (size * cols) + ((space * (cols - 1)) + space)); + bar:SetHeight((space + (size * rows)) + ((space * (rows - 1)) + space)); bar.backdrop:ClearAllPoints() bar.backdrop:SetAllPoints() bar._fade = db.mouseover; @@ -881,9 +881,9 @@ local Vehicle_Updater = function() local columns = ceil(total / rows) if (HasOverrideActionBar() or HasVehicleActionBar()) and total == 12 then bar.backdrop:ClearAllPoints() - bar.backdrop:ModPoint(SV.db.ActionBars["Bar1"].point, bar, SV.db.ActionBars["Bar1"].point) - bar.backdrop:ModWidth(space + ((size * rows) + (space * (rows - 1)) + space)) - bar.backdrop:ModHeight(space + ((size * columns) + (space * (columns - 1)) + space)) + bar.backdrop:SetPoint(SV.db.ActionBars["Bar1"].point, bar, SV.db.ActionBars["Bar1"].point) + bar.backdrop:SetWidth(space + ((size * rows) + (space * (rows - 1)) + space)) + bar.backdrop:SetHeight(space + ((size * columns) + (space * (columns - 1)) + space)) bar.backdrop:SetFrameLevel(0); else bar.backdrop:SetAllPoints() @@ -963,13 +963,13 @@ CreateActionBars = function(self) thisBar.page = barPageIndex[i] if(i == 3) then - thisBar:ModPoint("BOTTOMLEFT", _G["SVUI_ActionBar1"], "BOTTOMRIGHT", space, 0) + thisBar:SetPoint("BOTTOMLEFT", _G["SVUI_ActionBar1"], "BOTTOMRIGHT", space, 0) elseif(i == 4) then - thisBar:ModPoint("RIGHT", SV.Screen, "RIGHT", -space, 0) + thisBar:SetPoint("RIGHT", SV.Screen, "RIGHT", -space, 0) elseif(i == 5) then - thisBar:ModPoint("BOTTOMRIGHT", _G["SVUI_ActionBar1"], "BOTTOMLEFT", -space, 0) + thisBar:SetPoint("BOTTOMRIGHT", _G["SVUI_ActionBar1"], "BOTTOMLEFT", -space, 0) else - thisBar:ModPoint("BOTTOM", DEFAULT_MAIN_ANCHOR, "TOP", 0, space) + thisBar:SetPoint("BOTTOM", DEFAULT_MAIN_ANCHOR, "TOP", 0, space) DEFAULT_MAIN_ANCHOR = thisBar if(enabled) then self.MainAnchor:ClearAllPoints() @@ -1159,7 +1159,7 @@ do local stanceBar = NewActionBar("SVUI_StanceBar") stanceBar.binding = "CLICK SVUI_StanceBarButton%d:LeftButton" - stanceBar:ModPoint("BOTTOMRIGHT", self.MainAnchor, "TOPRIGHT", 0, 2); + stanceBar:SetPoint("BOTTOMRIGHT", self.MainAnchor, "TOPRIGHT", 0, 2); stanceBar:SetFrameLevel(5); local bg = CreateFrame("Frame", nil, stanceBar) @@ -1267,7 +1267,7 @@ do local petBar = NewActionBar("SVUI_PetActionBar") petBar.binding = "BONUSACTIONBUTTON%d" - petBar:ModPoint("BOTTOMLEFT", self.MainAnchor, "TOPLEFT", 0, 2); + petBar:SetPoint("BOTTOMLEFT", self.MainAnchor, "TOPLEFT", 0, 2); petBar:SetFrameLevel(5); local bg = CreateFrame("Frame", nil, petBar) bg:SetAllPoints(); @@ -1303,8 +1303,8 @@ end local CreateExtraBar = function(self) local specialBar = CreateFrame("Frame", "SVUI_SpecialAbility", SV.Screen) - specialBar:ModPoint("BOTTOM", SV.Screen, "BOTTOM", 0, 360) - specialBar:ModSize(ExtraActionBarFrame:GetSize()) + specialBar:SetPoint("BOTTOM", SV.Screen, "BOTTOM", 0, 360) + specialBar:SetSize(ExtraActionBarFrame:GetSize()) ExtraActionBarFrame:SetParent(specialBar) ExtraActionBarFrame:ClearAllPoints() ExtraActionBarFrame:SetPoint("CENTER", specialBar, "CENTER") diff --git a/SVUI_ActionBars/components/keybind.lua b/SVUI_ActionBars/components/keybind.lua index 5d2c559..4fac61f 100644 --- a/SVUI_ActionBars/components/keybind.lua +++ b/SVUI_ActionBars/components/keybind.lua @@ -518,13 +518,13 @@ function MOD:LoadKeyBinder() checkButton:SetScript("OnLeave", GameTooltip_Hide) local saveButton = NewFrame("Button", "SVUI_KeyBindPopupSaveButton", pop, "OptionsButtonTemplate") - saveButton:ModWidth(150) + saveButton:SetWidth(150) saveButton:SetStyle("Button") _G["SVUI_KeyBindPopupSaveButtonText"]:SetText(L["Save"]) saveButton:SetScript("OnClick", Save_OnClick) local discardButton = NewFrame("Button", "SVUI_KeyBindPopupDiscardButton", pop, "OptionsButtonTemplate") - discardButton:ModWidth(150) + discardButton:SetWidth(150) discardButton:SetStyle("Button") _G["SVUI_KeyBindPopupDiscardButtonText"]:SetText(L["Discard"]) discardButton:SetScript("OnClick", Discard_OnClick) diff --git a/SVUI_ActionBars/components/micro.lua b/SVUI_ActionBars/components/micro.lua index 759af96..4bac46f 100644 --- a/SVUI_ActionBars/components/micro.lua +++ b/SVUI_ActionBars/components/micro.lua @@ -43,14 +43,14 @@ local function RefreshMicrobar() local buttonSize = SV.db.ActionBars.Micro.buttonsize or 30; local spacing = SV.db.ActionBars.Micro.buttonspacing or 1; local barWidth = (buttonSize + spacing) * 13; - SVUI_MicroBar_MOVE:ModSize(barWidth, buttonSize) + SVUI_MicroBar_MOVE:SetSize(barWidth, buttonSize) SVUI_MicroBar:SetAllPoints(SVUI_MicroBar_MOVE) for i=1,13 do local data = MOD.media.microMenuCoords[i] local button = _G[data[1]] if(button) then button:ClearAllPoints() - button:ModSize(buttonSize, buttonSize + 28) + button:SetSize(buttonSize, buttonSize + 28) button._fade = SV.db.ActionBars.Micro.mouseover if lastParent == SVUI_MicroBar then button:SetPoint("BOTTOMLEFT", lastParent, "BOTTOMLEFT", 0, 0) @@ -130,10 +130,10 @@ function MOD:InitializeMicroBar() local barWidth = (buttonSize + spacing) * 13; local barHeight = (buttonSize + 6); local microBar = NewFrame('Frame', 'SVUI_MicroBar', UIParent) - microBar:ModSize(barWidth, barHeight) + microBar:SetSize(barWidth, barHeight) microBar:SetFrameStrata("HIGH") microBar:SetFrameLevel(0) - microBar:ModPoint('BOTTOMLEFT', SV.Dock.TopLeft.Bar.ToolBar, 'BOTTOMRIGHT', 4, 0) + microBar:SetPoint('BOTTOMLEFT', SV.Dock.TopLeft.Bar.ToolBar, 'BOTTOMRIGHT', 4, 0) SV:ManageVisibility(microBar) for i=1,13 do @@ -142,7 +142,7 @@ function MOD:InitializeMicroBar() local button = _G[data[1]] if(button) then button:SetParent(SVUI_MicroBar) - button:ModSize(buttonSize, buttonSize + 28) + button:SetSize(buttonSize, buttonSize + 28) button.Flash:SetTexture("") if button.SetPushedTexture then button:SetPushedTexture("") diff --git a/SVUI_ActionBars/components/totem.lua b/SVUI_ActionBars/components/totem.lua index 7acea97..75f9291 100644 --- a/SVUI_ActionBars/components/totem.lua +++ b/SVUI_ActionBars/components/totem.lua @@ -81,7 +81,7 @@ function Totems:Update() local button = self[i] if(button) then local lastButton = self[i - 1] - button:ModSize(totemSize) + button:SetSize(totemSize) button:ClearAllPoints() if(totemGrowth == "HORIZONTAL" and totemSort == "ASCENDING") then if(i == 1) then @@ -120,7 +120,7 @@ function Totems:Update() calcHeight = ((totemSize * MAX_TOTEMS) + (totemSpace * MAX_TOTEMS) + totemSpace); end - self:ModSize(calcWidth, calcHeight); + self:SetSize(calcWidth, calcHeight); self:Refresh() end diff --git a/SVUI_ActionBars/components/zone.lua b/SVUI_ActionBars/components/zone.lua index 5135e0d..40bc6ab 100644 --- a/SVUI_ActionBars/components/zone.lua +++ b/SVUI_ActionBars/components/zone.lua @@ -226,8 +226,8 @@ PACKAGE CALL function MOD:InitializeZoneButton() local size = SVUI_DraenorButtonHolder:GetHeight() local draenor = CreateFrame('Button', "SVUI_DraenorZoneAbility", UIParent, 'SecureActionButtonTemplate, SecureHandlerStateTemplate, SecureHandlerAttributeTemplate'); - draenor:ModSize(size,size); - draenor:ModPoint("CENTER", SVUI_DraenorButtonHolder, "CENTER", 0, 0); + draenor:SetSize(size,size); + draenor:SetPoint("CENTER", SVUI_DraenorButtonHolder, "CENTER", 0, 0); draenor:SetAlpha(0); draenor:SetStyle("Icon"); @@ -243,7 +243,7 @@ function MOD:InitializeZoneButton() local Artwork = draenor.Panel:CreateTexture('$parentArtwork', 'BACKGROUND') Artwork:SetPoint('CENTER', -2, 2) - Artwork:ModSize(size * 4.2, size * 2.1) + Artwork:SetSize(size * 4.2, size * 2.1) Artwork:SetTexture(texture) draenor.Artwork = Artwork diff --git a/SVUI_Auras/SVUI_Auras.lua b/SVUI_Auras/SVUI_Auras.lua index 1576730..e4a00d2 100644 --- a/SVUI_Auras/SVUI_Auras.lua +++ b/SVUI_Auras/SVUI_Auras.lua @@ -426,10 +426,10 @@ do buff:ClearAllPoints() if i==1 then - buff:ModPoint("TOP", MOD.HyperBuffFrame, "TOP", 0, 0) + buff:SetPoint("TOP", MOD.HyperBuffFrame, "TOP", 0, 0) lastGoodFrame = buff else - buff:ModPoint("TOP", lastGoodFrame, "BOTTOM", 0, -4) + buff:SetPoint("TOP", lastGoodFrame, "BOTTOM", 0, -4) end if(hideIndex and i == hideIndex) then @@ -517,13 +517,13 @@ end function MOD:UpdateAuraHolder(newHeight, referenceHolder) if(not newHeight) then return end - self.Holder:ModHeight(newHeight) + self.Holder:SetHeight(newHeight) if(self.Holder.Grip) then - self.Holder.Grip:ModHeight(newHeight) + self.Holder.Grip:SetHeight(newHeight) if((not self.Holder.Grip:HasMoved()) and (referenceHolder and referenceHolder.HasMoved and (not referenceHolder:HasMoved()))) then HOLDER_OFFSET = -8; self.Holder.Grip:ClearAllPoints() - self.Holder.Grip:ModPoint("TOPRIGHT", referenceHolder, "TOPLEFT", HOLDER_OFFSET, 0) + self.Holder.Grip:SetPoint("TOPRIGHT", referenceHolder, "TOPLEFT", HOLDER_OFFSET, 0) end end if(self.HyperBuffFrame) then @@ -560,7 +560,7 @@ function MOD:Load() end self.Holder:SetSize(CB_WIDTH, CB_HEIGHT) - self.Holder:ModPoint("TOPRIGHT", Minimap, "TOPLEFT", HOLDER_OFFSET, 0) + self.Holder:SetPoint("TOPRIGHT", Minimap, "TOPLEFT", HOLDER_OFFSET, 0) if(SV.db.Auras.hyperBuffsEnabled) then ConsolidatedBuffs:Die() diff --git a/SVUI_Chat/SVUI_Chat.lua b/SVUI_Chat/SVUI_Chat.lua index 4535b42..fad2f33 100644 --- a/SVUI_Chat/SVUI_Chat.lua +++ b/SVUI_Chat/SVUI_Chat.lua @@ -632,7 +632,7 @@ do local lastTab = TabsList[1]; if(lastTab) then lastTab:ClearAllPoints() - lastTab:ModPoint("LEFT", MOD.Dock.Bar, "LEFT", 2, 0); + lastTab:SetPoint("LEFT", MOD.Dock.Bar, "LEFT", 2, 0); end local offset = 1; for chatID,frame in pairs(TabsList) do @@ -665,7 +665,7 @@ do end frame:SetParent(chat) frame:ClearAllPoints() - frame:ModPoint("TOPLEFT", chat, "BOTTOMLEFT", -3, -6) + frame:SetPoint("TOPLEFT", chat, "BOTTOMLEFT", -3, -6) TABS_DIRTY = true _repositionDockedTabs() end @@ -782,7 +782,7 @@ do if tab.conversationIcon then tab.conversationIcon:SetAlpha(0) tab.conversationIcon:ClearAllPoints() - tab.conversationIcon:ModPoint("TOPLEFT", tab, "TOPLEFT", 0, 0) + tab.conversationIcon:SetPoint("TOPLEFT", tab, "TOPLEFT", 0, 0) end if(TAB_SKINS and not tab.IsStyled) then local arg3 = (chat.inUse or chat.isDocked or chat.isTemporary) @@ -827,7 +827,7 @@ do --copy chat button chat.button = CreateFrame('Frame', format("SVUI_CopyChatButton%d", chatID), chat) chat.button:SetAlpha(0.35) - chat.button:ModSize(38, 18) + chat.button:SetSize(38, 18) chat.button:SetPoint('TOPRIGHT', chat, 'TOPRIGHT', 0, 0) chat.button:SetStyle("Frame", "Lite") diff --git a/SVUI_CraftOMatic/components/farming.lua b/SVUI_CraftOMatic/components/farming.lua index bef347f..1ebda4c 100644 --- a/SVUI_CraftOMatic/components/farming.lua +++ b/SVUI_CraftOMatic/components/farming.lua @@ -279,7 +279,7 @@ do button:SetStyle("!_Frame", "Transparent") button.Panel:SetFrameLevel(0) button:SetNormalTexture(nil) - button:ModSize(BUTTONSIZE, BUTTONSIZE) + button:SetSize(BUTTONSIZE, BUTTONSIZE) button.sortname = name button.itemId = index button.allowDrop = allowDrop @@ -446,8 +446,8 @@ function PLUGIN:RefreshFarmingTools() if(seedButtons[i]) then for i, button in ipairs(seedButtons[i]) do local BUTTONSIZE = seedBar.ButtonSize; - button:ModPoint("TOPLEFT", seedBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) - button:ModSize(BUTTONSIZE,BUTTONSIZE) + button:SetPoint("TOPLEFT", seedBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) + button:SetSize(BUTTONSIZE,BUTTONSIZE) if (not CONFIGS.farming.onlyactive or (CONFIGS.farming.onlyactive and button.items > 0)) then button.icon:SetVertexColor(1,1,1) count = count + 1 @@ -480,8 +480,8 @@ function PLUGIN:RefreshFarmingTools() FarmToolBar:SetAllPoints(FarmToolBarAnchor) for i, button in ipairs(farmToolButtons) do local BUTTONSIZE = FarmToolBar.ButtonSize; - button:ModPoint("TOPLEFT", FarmToolBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) - button:ModSize(BUTTONSIZE,BUTTONSIZE) + button:SetPoint("TOPLEFT", FarmToolBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) + button:SetSize(BUTTONSIZE,BUTTONSIZE) if (not CONFIGS.farming.onlyactive or (CONFIGS.farming.onlyactive and button.items > 0)) then button:Show() button.icon:SetVertexColor(1,1,1) @@ -508,8 +508,8 @@ function PLUGIN:RefreshFarmingTools() FarmPortalBar:SetAllPoints(FarmPortalBarAnchor) for i, button in ipairs(portalButtons) do local BUTTONSIZE = FarmPortalBar.ButtonSize; - button:ModPoint("TOPLEFT", FarmPortalBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) - button:ModSize(BUTTONSIZE,BUTTONSIZE) + button:SetPoint("TOPLEFT", FarmPortalBar, "TOPLEFT", horizontal and (count * (BUTTONSIZE + BUTTONSPACE) + 1) or 1, horizontal and -1 or -(count * (BUTTONSIZE + BUTTONSPACE) + 1)) + button:SetSize(BUTTONSIZE,BUTTONSIZE) if (not CONFIGS.farming.onlyactive or (CONFIGS.farming.onlyactive and button.items > 0)) then button:Show() button.icon:SetVertexColor(1,1,1) @@ -578,33 +578,33 @@ function PLUGIN:PrepareFarmingTools() -- FARM TOOLS local farmToolBarAnchor = CreateFrame("Frame", "FarmToolBarAnchor", farmingDockletSlots) - farmToolBarAnchor:ModPoint("TOPLEFT", farmingDockletSlots, "TOPLEFT", 0, 0) - farmToolBarAnchor:ModSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) + farmToolBarAnchor:SetPoint("TOPLEFT", farmingDockletSlots, "TOPLEFT", 0, 0) + farmToolBarAnchor:SetSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) local farmToolBar = CreateFrame("Frame", "FarmToolBar", farmToolBarAnchor) - farmToolBar:ModSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) + farmToolBar:SetSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) farmToolBar:SetPoint("TOPLEFT", farmToolBarAnchor, "TOPLEFT", (horizontal and BUTTONSPACE or (TOOLSIZE + BUTTONSPACE)), (horizontal and -(TOOLSIZE + BUTTONSPACE) or -BUTTONSPACE)) farmToolBar.ButtonSize = TOOLSIZE; -- PORTALS local farmPortalBarAnchor = CreateFrame("Frame", "FarmPortalBarAnchor", farmingDockletSlots) - farmPortalBarAnchor:ModPoint("TOPLEFT", farmToolBarAnchor, "TOPRIGHT", 0, 0) - farmPortalBarAnchor:ModSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) + farmPortalBarAnchor:SetPoint("TOPLEFT", farmToolBarAnchor, "TOPRIGHT", 0, 0) + farmPortalBarAnchor:SetSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) local farmPortalBar = CreateFrame("Frame", "FarmPortalBar", farmPortalBarAnchor) - farmPortalBar:ModSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) + farmPortalBar:SetSize(horizontal and ((TOOLSIZE + BUTTONSPACE) * 4) or (TOOLSIZE + BUTTONSPACE), horizontal and (TOOLSIZE + BUTTONSPACE) or ((TOOLSIZE + BUTTONSPACE) * 4)) farmPortalBar:SetPoint("TOPLEFT", farmPortalBarAnchor, "TOPLEFT", (horizontal and BUTTONSPACE or (TOOLSIZE + BUTTONSPACE)), (horizontal and -(TOOLSIZE + BUTTONSPACE) or -BUTTONSPACE)) farmPortalBar.ButtonSize = TOOLSIZE; -- SEEDS local farmSeedBarAnchor = CreateFrame("Frame", "FarmSeedBarAnchor", farmingDockletSlots) - farmSeedBarAnchor:ModPoint("TOPLEFT", farmPortalBarAnchor, horizontal and "BOTTOMLEFT" or "TOPRIGHT", 0, 0) - farmSeedBarAnchor:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or ((BUTTONSIZE + BUTTONSPACE) * 8), horizontal and ((BUTTONSIZE + BUTTONSPACE) * 8) or ((BUTTONSIZE + BUTTONSPACE) * 10)) + farmSeedBarAnchor:SetPoint("TOPLEFT", farmPortalBarAnchor, horizontal and "BOTTOMLEFT" or "TOPRIGHT", 0, 0) + farmSeedBarAnchor:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or ((BUTTONSIZE + BUTTONSPACE) * 8), horizontal and ((BUTTONSIZE + BUTTONSPACE) * 8) or ((BUTTONSIZE + BUTTONSPACE) * 10)) for i = 1, NUM_SEED_BARS do local seedBar = CreateFrame("Frame", "FarmSeedBar"..i, farmSeedBarAnchor) seedBar.ButtonSize = BUTTONSIZE; - seedBar:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 10)) + seedBar:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 10)) if i == 1 then seedBar:SetPoint("TOPLEFT", farmSeedBarAnchor, "TOPLEFT", 0, 0) else @@ -618,11 +618,11 @@ function PLUGIN:PrepareFarmingTools() -- SEEDS local farmSeedBarAnchor = CreateFrame("Frame", "FarmSeedBarAnchor", UIParent) - farmSeedBarAnchor:ModPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -40, -300) - farmSeedBarAnchor:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or ((BUTTONSIZE + BUTTONSPACE) * 8), horizontal and ((BUTTONSIZE + BUTTONSPACE) * 8) or ((BUTTONSIZE + BUTTONSPACE) * 10)) + farmSeedBarAnchor:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -40, -300) + farmSeedBarAnchor:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or ((BUTTONSIZE + BUTTONSPACE) * 8), horizontal and ((BUTTONSIZE + BUTTONSPACE) * 8) or ((BUTTONSIZE + BUTTONSPACE) * 10)) for i = 1, NUM_SEED_BARS do local seedBar = CreateFrame("Frame", "FarmSeedBar"..i, farmSeedBarAnchor) - seedBar:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 10)) + seedBar:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 10) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 10)) seedBar:SetPoint("TOPRIGHT", _G["FarmSeedBarAnchor"], "TOPRIGHT", (horizontal and 0 or -((BUTTONSIZE + BUTTONSPACE) * i)), (horizontal and -((BUTTONSIZE + BUTTONSPACE) * i) or 0)) seedBar.ButtonSize = BUTTONSIZE; end @@ -630,20 +630,20 @@ function PLUGIN:PrepareFarmingTools() -- FARM TOOLS local farmToolBarAnchor = CreateFrame("Frame", "FarmToolBarAnchor", UIParent) - farmToolBarAnchor:ModPoint("TOPRIGHT", farmSeedBarAnchor, horizontal and "BOTTOMRIGHT" or "TOPLEFT", horizontal and 0 or -(BUTTONSPACE * 2), horizontal and -(BUTTONSPACE * 2) or 0) - farmToolBarAnchor:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) + farmToolBarAnchor:SetPoint("TOPRIGHT", farmSeedBarAnchor, horizontal and "BOTTOMRIGHT" or "TOPLEFT", horizontal and 0 or -(BUTTONSPACE * 2), horizontal and -(BUTTONSPACE * 2) or 0) + farmToolBarAnchor:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) local farmToolBar = CreateFrame("Frame", "FarmToolBar", farmToolBarAnchor) - farmToolBar:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) + farmToolBar:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) farmToolBar:SetPoint("TOPRIGHT", farmToolBarAnchor, "TOPRIGHT", (horizontal and -BUTTONSPACE or -(BUTTONSIZE + BUTTONSPACE)), (horizontal and -(BUTTONSIZE + BUTTONSPACE) or -BUTTONSPACE)) farmToolBar.ButtonSize = BUTTONSIZE; SV.Mentalo:Add(farmToolBarAnchor, "Farming Tools") -- PORTALS local farmPortalBarAnchor = CreateFrame("Frame", "FarmPortalBarAnchor", UIParent) - farmPortalBarAnchor:ModPoint("TOPRIGHT", farmToolBarAnchor, horizontal and "BOTTOMRIGHT" or "TOPLEFT", horizontal and 0 or -(BUTTONSPACE * 2), horizontal and -(BUTTONSPACE * 2) or 0) - farmPortalBarAnchor:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) + farmPortalBarAnchor:SetPoint("TOPRIGHT", farmToolBarAnchor, horizontal and "BOTTOMRIGHT" or "TOPLEFT", horizontal and 0 or -(BUTTONSPACE * 2), horizontal and -(BUTTONSPACE * 2) or 0) + farmPortalBarAnchor:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) local farmPortalBar = CreateFrame("Frame", "FarmPortalBar", farmPortalBarAnchor) - farmPortalBar:ModSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) + farmPortalBar:SetSize(horizontal and ((BUTTONSIZE + BUTTONSPACE) * 4) or (BUTTONSIZE + BUTTONSPACE), horizontal and (BUTTONSIZE + BUTTONSPACE) or ((BUTTONSIZE + BUTTONSPACE) * 4)) farmPortalBar:SetPoint("TOPRIGHT", farmPortalBarAnchor, "TOPRIGHT", (horizontal and -BUTTONSPACE or -(BUTTONSIZE + BUTTONSPACE)), (horizontal and -(BUTTONSIZE + BUTTONSPACE) or -BUTTONSPACE)) farmPortalBar.ButtonSize = BUTTONSIZE; SV.Mentalo:Add(farmPortalBarAnchor, "Farming Portals") diff --git a/SVUI_FightOMatic/SVUI_FightOMatic.lua b/SVUI_FightOMatic/SVUI_FightOMatic.lua index 56f5818..d773835 100644 --- a/SVUI_FightOMatic/SVUI_FightOMatic.lua +++ b/SVUI_FightOMatic/SVUI_FightOMatic.lua @@ -862,15 +862,15 @@ local function MakeInfoWindow() local DATA_HEIGHT = frame:GetHeight() - 2; local leftColumn = CreateFrame("Frame", "SVUI_FightOMaticInfoLeft", frame) - leftColumn:ModSize(DATA_WIDTH, DATA_HEIGHT) - leftColumn:ModPoint("LEFT", frame, "LEFT", 0, 0) + leftColumn:SetSize(DATA_WIDTH, DATA_HEIGHT) + leftColumn:SetPoint("LEFT", frame, "LEFT", 0, 0) leftColumn.lockedOpen = true SV.Reports:NewHolder(leftColumn, 3, "ANCHOR_CURSOR", 1, "Transparent") leftColumn:SetFrameLevel(0) local rightColumn = CreateFrame("Frame", "SVUI_FightOMaticInfoRight", frame) - rightColumn:ModSize(DATA_WIDTH, DATA_HEIGHT) - rightColumn:ModPoint("LEFT", leftColumn, "RIGHT", 2, 0) + rightColumn:SetSize(DATA_WIDTH, DATA_HEIGHT) + rightColumn:SetPoint("LEFT", leftColumn, "RIGHT", 2, 0) rightColumn.lockedOpen = true SV.Reports:NewHolder(rightColumn, 3, "ANCHOR_CURSOR", 2, "Transparent") rightColumn:SetFrameLevel(0) diff --git a/SVUI_Inventory/SVUI_Inventory.lua b/SVUI_Inventory/SVUI_Inventory.lua index 4079232..8f9ee41 100644 --- a/SVUI_Inventory/SVUI_Inventory.lua +++ b/SVUI_Inventory/SVUI_Inventory.lua @@ -501,14 +501,14 @@ local ContainerFrame_UpdateLayout = function(self) local totalSlots = 0; self.ButtonSize = buttonSize; - self.holderFrame:ModWidth(holderWidth); + self.holderFrame:SetWidth(holderWidth); local menu = self.BagMenu; local lastMenu; for i, bagID in ipairs(self.BagIDs) do if((not isBank and bagID <= 3) or (isBank and bagID ~= -1 and numContainerSlots >= 1 and not (i - 1 > numContainerSlots))) then - menu:ModSize(((buttonSize + buttonSpacing) * (isBank and i - 1 or i)) + buttonSpacing, buttonSize + (buttonSpacing * 2)) + menu:SetSize(((buttonSize + buttonSpacing) * (isBank and i - 1 or i)) + buttonSpacing, buttonSize + (buttonSpacing * 2)) local bagSlot = menu[i]; if(not bagSlot) then @@ -552,7 +552,7 @@ local ContainerFrame_UpdateLayout = function(self) menu[i] = bagSlot; end - bagSlot:ModSize(buttonSize) + bagSlot:SetSize(buttonSize) bagSlot:ClearAllPoints() if(isBank) then @@ -630,10 +630,10 @@ local ContainerFrame_UpdateLayout = function(self) if(not self.Bags[bagID][slotID].JunkIcon) then self.Bags[bagID][slotID].JunkIcon = self.Bags[bagID][slotID]:CreateTexture(nil, "OVERLAY"); - self.Bags[bagID][slotID].JunkIcon:ModSize(16,16); + self.Bags[bagID][slotID].JunkIcon:SetSize(16,16); end self.Bags[bagID][slotID].JunkIcon:SetTexture([[Interface\BUTTONS\UI-GroupLoot-Coin-Up]]); - self.Bags[bagID][slotID].JunkIcon:ModPoint("TOPLEFT", self.Bags[bagID][slotID], "TOPLEFT", -4, 4); + self.Bags[bagID][slotID].JunkIcon:SetPoint("TOPLEFT", self.Bags[bagID][slotID], "TOPLEFT", -4, 4); if(not self.Bags[bagID][slotID].icon) then self.Bags[bagID][slotID].icon = self.Bags[bagID][slotID]:CreateTexture(nil, "BORDER"); @@ -662,7 +662,7 @@ local ContainerFrame_UpdateLayout = function(self) end self.Bags[bagID][slotID]:SetID(slotID); - self.Bags[bagID][slotID]:ModSize(buttonSize); + self.Bags[bagID][slotID]:SetSize(buttonSize); if self.Bags[bagID][slotID]:GetPoint() then self.Bags[bagID][slotID]:ClearAllPoints(); @@ -670,13 +670,13 @@ local ContainerFrame_UpdateLayout = function(self) if lastButton then if((totalSlots - 1) % numContainerColumns == 0) then - self.Bags[bagID][slotID]:ModPoint("TOP", lastRowButton, "BOTTOM", 0, -buttonSpacing); + self.Bags[bagID][slotID]:SetPoint("TOP", lastRowButton, "BOTTOM", 0, -buttonSpacing); lastRowButton = self.Bags[bagID][slotID]; else - self.Bags[bagID][slotID]:ModPoint("LEFT", lastButton, "RIGHT", buttonSpacing, 0); + self.Bags[bagID][slotID]:SetPoint("LEFT", lastButton, "RIGHT", buttonSpacing, 0); end else - self.Bags[bagID][slotID]:ModPoint("TOPLEFT", self.holderFrame, "TOPLEFT"); + self.Bags[bagID][slotID]:SetPoint("TOPLEFT", self.holderFrame, "TOPLEFT"); lastRowButton = self.Bags[bagID][slotID]; end @@ -704,7 +704,7 @@ local ContainerFrame_UpdateLayout = function(self) end end - self:ModSize(containerWidth, containerHeight); + self:SetSize(containerWidth, containerHeight); MOD:UpdateStockpile() end @@ -728,7 +728,7 @@ local ReagentFrame_UpdateLayout = function(self) local bagID = REAGENTBANK_CONTAINER; local totalSlots = 0; - self.holderFrame:ModWidth(holderWidth); + self.holderFrame:SetWidth(holderWidth); self.BagID = bagID local bag; @@ -770,9 +770,9 @@ local ReagentFrame_UpdateLayout = function(self) slot.NewItemTexture:Hide() slot.JunkIcon = slot:CreateTexture(nil, "OVERLAY"); - slot.JunkIcon:ModSize(16,16); + slot.JunkIcon:SetSize(16,16); slot.JunkIcon:SetTexture(""); - slot.JunkIcon:ModPoint("TOPLEFT", slot, "TOPLEFT", -4, 4); + slot.JunkIcon:SetPoint("TOPLEFT", slot, "TOPLEFT", -4, 4); slot.icon = _G[iconName] or slot:CreateTexture(nil, "BORDER"); slot.icon:InsetPoints(slot); @@ -791,7 +791,7 @@ local ReagentFrame_UpdateLayout = function(self) end slot:SetID(slotID); - slot:ModSize(buttonSize); + slot:SetSize(buttonSize); if slot:GetPoint() then slot:ClearAllPoints(); @@ -799,13 +799,13 @@ local ReagentFrame_UpdateLayout = function(self) if lastButton then if((totalSlots - 1) % numContainerColumns == 0) then - slot:ModPoint("TOP", lastRowButton, "BOTTOM", 0, -buttonSpacing); + slot:SetPoint("TOP", lastRowButton, "BOTTOM", 0, -buttonSpacing); lastRowButton = slot; else - slot:ModPoint("LEFT", lastButton, "RIGHT", buttonSpacing, 0); + slot:SetPoint("LEFT", lastButton, "RIGHT", buttonSpacing, 0); end else - slot:ModPoint("TOPLEFT", self.holderFrame, "TOPLEFT"); + slot:SetPoint("TOPLEFT", self.holderFrame, "TOPLEFT"); lastRowButton = slot; end @@ -819,7 +819,7 @@ local ReagentFrame_UpdateLayout = function(self) bag:SlotUpdate(slotID); end - self:ModSize(containerWidth, containerHeight); + self:SetSize(containerWidth, containerHeight); MOD:UpdateStockpile() end @@ -872,22 +872,22 @@ function MOD:ModifyBags() if(docked) then if self.BagFrame then self.BagFrame:ClearAllPoints() - self.BagFrame:ModPoint("BOTTOMRIGHT", SV.Dock.BottomRight, "BOTTOMRIGHT", 0, 0) + self.BagFrame:SetPoint("BOTTOMRIGHT", SV.Dock.BottomRight, "BOTTOMRIGHT", 0, 0) end if self.BankFrame then self.BankFrame:ClearAllPoints() - self.BankFrame:ModPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "BOTTOMLEFT", 0, 0) + self.BankFrame:SetPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "BOTTOMLEFT", 0, 0) end else if self.BagFrame then local anchor, x, y = SV.db.Inventory.bags.point, SV.db.Inventory.bags.xOffset, SV.db.Inventory.bags.yOffset self.BagFrame:ClearAllPoints() - self.BagFrame:ModPoint(anchor, SV.Screen, anchor, x, y) + self.BagFrame:SetPoint(anchor, SV.Screen, anchor, x, y) end if self.BankFrame then local anchor, x, y = SV.db.Inventory.bank.point, SV.db.Inventory.bank.xOffset, SV.db.Inventory.bank.yOffset self.BankFrame:ClearAllPoints() - self.BankFrame:ModPoint(anchor, SV.Screen, anchor, x, y) + self.BankFrame:SetPoint(anchor, SV.Screen, anchor, x, y) end end end @@ -947,7 +947,7 @@ do MainMenuBarBackpackButton:SetPoint("BOTTOMLEFT", BagBar, "BOTTOMLEFT", 2, 2) MainMenuBarBackpackButtonCount:SetFontObject(SVUI_Font_Default) MainMenuBarBackpackButtonCount:ClearAllPoints() - MainMenuBarBackpackButtonCount:ModPoint("BOTTOMRIGHT", MainMenuBarBackpackButton, "BOTTOMRIGHT", -1, 4) + MainMenuBarBackpackButtonCount:SetPoint("BOTTOMRIGHT", MainMenuBarBackpackButton, "BOTTOMRIGHT", -1, 4) MainMenuBarBackpackButton:HookScript("OnEnter", BagBar_OnEnter) MainMenuBarBackpackButton:HookScript("OnLeave", BagBar_OnLeave) @@ -1221,15 +1221,15 @@ do frame.Bags = {} frame.closeButton = CreateFrame("Button", "SVUI_ContainerFrameCloseButton", frame, "UIPanelCloseButton") - frame.closeButton:ModPoint("TOPRIGHT", -4, -4) + frame.closeButton:SetPoint("TOPRIGHT", -4, -4) SV.API:Set("CloseButton", frame.closeButton); frame.closeButton:SetScript("PostClick", function() if(not InCombatLockdown()) then CloseBag(0) end end) frame.holderFrame = CreateFrame("Frame", nil, frame) - frame.holderFrame:ModPoint("TOP", frame, "TOP", 0, -frame.topOffset) - frame.holderFrame:ModPoint("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset) + frame.holderFrame:SetPoint("TOP", frame, "TOP", 0, -frame.topOffset) + frame.holderFrame:SetPoint("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset) frame.Title = frame:CreateFontString() frame.Title:SetFontObject(SVUI_Font_Header) @@ -1238,22 +1238,22 @@ do frame.Title:SetTextColor(1,0.8,0) frame.BagMenu = CreateFrame("Button", "SVUI_ContainerFrameBagMenu", frame) - frame.BagMenu:ModPoint("BOTTOMLEFT", frame, "TOPLEFT", 0, 1) + frame.BagMenu:SetPoint("BOTTOMLEFT", frame, "TOPLEFT", 0, 1) frame.BagMenu:SetStyle("!_Frame", "Transparent") frame.BagMenu:Hide() frame.goldText = frame:CreateFontString(nil, "OVERLAY") frame.goldText:SetFontObject(SVUI_Font_Bag_Number) - frame.goldText:ModPoint("BOTTOMRIGHT", frame.holderFrame, "TOPRIGHT", -2, 4) + frame.goldText:SetPoint("BOTTOMRIGHT", frame.holderFrame, "TOPRIGHT", -2, 4) frame.goldText:SetJustifyH("RIGHT") frame.editBox = CreateFrame("EditBox", "SVUI_ContainerFrameEditBox", frame) frame.editBox:SetFrameLevel(frame.editBox:GetFrameLevel()+2) frame.editBox:SetStyle("Editbox") - frame.editBox:ModHeight(15) + frame.editBox:SetHeight(15) frame.editBox:Hide() - frame.editBox:ModPoint("BOTTOMLEFT", frame.holderFrame, "TOPLEFT", 2, 4) - frame.editBox:ModPoint("RIGHT", frame.goldText, "LEFT", -5, 0) + frame.editBox:SetPoint("BOTTOMLEFT", frame.holderFrame, "TOPLEFT", 2, 4) + frame.editBox:SetPoint("RIGHT", frame.goldText, "LEFT", -5, 0) frame.editBox:SetAutoFocus(true) frame.editBox:SetScript("OnEscapePressed", InventorySearch_OnReset) frame.editBox:SetScript("OnEnterPressed", InventorySearch_OnReset) @@ -1280,8 +1280,8 @@ do frame.detail = searchButton frame.sortButton = CreateFrame("Button", nil, frame) - frame.sortButton:ModPoint("TOP", frame, "TOP", 0, -10) - frame.sortButton:ModSize(25, 25) + frame.sortButton:SetPoint("TOP", frame, "TOP", 0, -10) + frame.sortButton:SetSize(25, 25) StyleBagToolButton(frame.sortButton, MOD.media.cleanupIcon) frame.sortButton.ttText = L["Sort Bags"] frame.sortButton.altText = L["Filtered Cleanup"] @@ -1291,8 +1291,8 @@ do frame.sortButton:SetScript("OnClick", Sort_OnClick) frame.stackButton = CreateFrame("Button", nil, frame) - frame.stackButton:ModPoint("LEFT", frame.sortButton, "RIGHT", 10, 0) - frame.stackButton:ModSize(25, 25) + frame.stackButton:SetPoint("LEFT", frame.sortButton, "RIGHT", 10, 0) + frame.stackButton:SetSize(25, 25) StyleBagToolButton(frame.stackButton, MOD.media.stackIcon) frame.stackButton.ttText = L["Stack Items"] frame.stackButton:SetScript("OnEnter", Tooltip_Show) @@ -1301,8 +1301,8 @@ do frame.stackButton:SetScript("OnClick", Stack_OnClick) frame.vendorButton = CreateFrame("Button", nil, frame) - frame.vendorButton:ModPoint("RIGHT", frame.sortButton, "LEFT", -10, 0) - frame.vendorButton:ModSize(25, 25) + frame.vendorButton:SetPoint("RIGHT", frame.sortButton, "LEFT", -10, 0) + frame.vendorButton:SetSize(25, 25) StyleBagToolButton(frame.vendorButton, MOD.media.vendorIcon) frame.vendorButton.ttText = L["Vendor Grays"] frame.vendorButton.ttText2 = L["Hold Shift:"] @@ -1312,8 +1312,8 @@ do frame.vendorButton:SetScript("OnClick", Vendor_OnClick) frame.bagsButton = CreateFrame("Button", nil, frame) - frame.bagsButton:ModPoint("RIGHT", frame.vendorButton, "LEFT", -10, 0) - frame.bagsButton:ModSize(25, 25) + frame.bagsButton:SetPoint("RIGHT", frame.vendorButton, "LEFT", -10, 0) + frame.bagsButton:SetSize(25, 25) StyleBagToolButton(frame.bagsButton, MOD.media.bagIcon) frame.bagsButton.ttText = L["Toggle Bags"] frame.bagsButton:SetScript("OnEnter", Tooltip_Show) @@ -1328,8 +1328,8 @@ do frame.bagsButton:SetScript("OnClick", BagBtn_OnClick) frame.transferButton = CreateFrame("Button", nil, frame) - frame.transferButton:ModPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) - frame.transferButton:ModSize(25, 25) + frame.transferButton:SetPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) + frame.transferButton:SetSize(25, 25) StyleBagToolButton(frame.transferButton, MOD.media.transferIcon) frame.transferButton.ttText = L["Stack Bags to Bank"] frame.transferButton:SetScript("OnEnter", Tooltip_Show) @@ -1338,19 +1338,19 @@ do frame.transferButton:SetScript("OnClick", Transfer_OnClick) frame.currencyButton = CreateFrame("Frame", nil, frame) - frame.currencyButton:ModPoint("BOTTOMLEFT", frame, "BOTTOMLEFT", 4, 0) - frame.currencyButton:ModPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -4, 0) - frame.currencyButton:ModHeight(32) + frame.currencyButton:SetPoint("BOTTOMLEFT", frame, "BOTTOMLEFT", 4, 0) + frame.currencyButton:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -4, 0) + frame.currencyButton:SetHeight(32) for h = 1, MAX_WATCHED_TOKENS do frame.currencyButton[h] = CreateFrame("Button", nil, frame.currencyButton) - frame.currencyButton[h]:ModSize(22) + frame.currencyButton[h]:SetSize(22) frame.currencyButton[h]:SetStyle("!_Frame", "Default") frame.currencyButton[h]:SetID(h) frame.currencyButton[h].icon = frame.currencyButton[h]:CreateTexture(nil, "OVERLAY") frame.currencyButton[h].icon:InsetPoints() frame.currencyButton[h].icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) frame.currencyButton[h].text = frame.currencyButton[h]:CreateFontString(nil, "OVERLAY") - frame.currencyButton[h].text:ModPoint("LEFT", frame.currencyButton[h], "RIGHT", 2, 0) + frame.currencyButton[h].text:SetPoint("LEFT", frame.currencyButton[h], "RIGHT", 2, 0) frame.currencyButton[h].text:SetFontObject(SVUI_Font_Bag_Number) frame.currencyButton[h]:SetScript("OnEnter", Token_OnEnter) frame.currencyButton[h]:SetScript("OnLeave", Token_OnLeave) @@ -1411,15 +1411,15 @@ do frame.Bags = {} frame.closeButton = CreateFrame("Button", bagName.."CloseButton", frame, "UIPanelCloseButton") - frame.closeButton:ModPoint("TOPRIGHT", -4, -4) + frame.closeButton:SetPoint("TOPRIGHT", -4, -4) SV.API:Set("CloseButton", frame.closeButton); frame.closeButton:SetScript("PostClick", function() if(not InCombatLockdown()) then CloseBag(0) end end) frame.holderFrame = CreateFrame("Frame", nil, frame) - frame.holderFrame:ModPoint("TOP", frame, "TOP", 0, -frame.topOffset) - frame.holderFrame:ModPoint("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset) + frame.holderFrame:SetPoint("TOP", frame, "TOP", 0, -frame.topOffset) + frame.holderFrame:SetPoint("BOTTOM", frame, "BOTTOM", 0, frame.bottomOffset) frame.Title = frame:CreateFontString() frame.Title:SetFontObject(SVUI_Font_Header) @@ -1428,8 +1428,8 @@ do frame.Title:SetTextColor(1,0.8,0) frame.sortButton = CreateFrame("Button", nil, frame) - frame.sortButton:ModPoint("TOPRIGHT", frame, "TOP", 0, -10) - frame.sortButton:ModSize(25, 25) + frame.sortButton:SetPoint("TOPRIGHT", frame, "TOP", 0, -10) + frame.sortButton:SetSize(25, 25) StyleBagToolButton(frame.sortButton, MOD.media.cleanupIcon) frame.sortButton.ttText = L["Sort Bank"] frame.sortButton.altText = L["Filtered Cleanup"] @@ -1437,8 +1437,8 @@ do frame.sortButton:SetScript("OnLeave", Tooltip_Hide) frame.stackButton = CreateFrame("Button", nil, frame) - frame.stackButton:ModPoint("LEFT", frame.sortButton, "RIGHT", 10, 0) - frame.stackButton:ModSize(25, 25) + frame.stackButton:SetPoint("LEFT", frame.sortButton, "RIGHT", 10, 0) + frame.stackButton:SetSize(25, 25) StyleBagToolButton(frame.stackButton, MOD.media.stackIcon) frame.stackButton.ttText = L["Stack Items"] frame.stackButton:SetScript("OnEnter", Tooltip_Show) @@ -1446,7 +1446,7 @@ do if(not isReagent) then frame.BagMenu = CreateFrame("Button", bagName.."BagMenu", frame) - frame.BagMenu:ModPoint("BOTTOMLEFT", frame, "TOPLEFT", 0, 1) + frame.BagMenu:SetPoint("BOTTOMLEFT", frame, "TOPLEFT", 0, 1) frame.BagMenu:SetStyle("!_Frame", "Transparent") frame.BagMenu:Hide() @@ -1456,8 +1456,8 @@ do frame.stackButton:SetScript("OnClick", Stack_OnClick) frame.transferButton = CreateFrame("Button", nil, frame) - frame.transferButton:ModPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) - frame.transferButton:ModSize(25, 25) + frame.transferButton:SetPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) + frame.transferButton:SetSize(25, 25) StyleBagToolButton(frame.transferButton, MOD.media.transferIcon) frame.transferButton.ttText = L["Stack Bank to Bags"] frame.transferButton:SetScript("OnEnter", Tooltip_Show) @@ -1468,8 +1468,8 @@ do tinsert(UISpecialFrames, bagName) frame.bagsButton = CreateFrame("Button", nil, frame) - frame.bagsButton:ModPoint("RIGHT", frame.sortButton, "LEFT", -10, 0) - frame.bagsButton:ModSize(25, 25) + frame.bagsButton:SetPoint("RIGHT", frame.sortButton, "LEFT", -10, 0) + frame.bagsButton:SetSize(25, 25) StyleBagToolButton(frame.bagsButton, MOD.media.bagIcon) frame.bagsButton.ttText = L["Toggle Bags"] frame.bagsButton:SetScript("OnEnter", Tooltip_Show) @@ -1489,8 +1489,8 @@ do frame.bagsButton:SetScript("OnClick", BagBtn_OnClick) frame.purchaseBagButton = CreateFrame("Button", nil, frame) - frame.purchaseBagButton:ModSize(25, 25) - frame.purchaseBagButton:ModPoint("RIGHT", frame.bagsButton, "LEFT", -10, 0) + frame.purchaseBagButton:SetSize(25, 25) + frame.purchaseBagButton:SetPoint("RIGHT", frame.bagsButton, "LEFT", -10, 0) frame.purchaseBagButton:SetFrameLevel(frame.purchaseBagButton:GetFrameLevel()+2) StyleBagToolButton(frame.purchaseBagButton, MOD.media.purchaseIcon) frame.purchaseBagButton.ttText = L["Purchase"] @@ -1509,8 +1509,8 @@ do local active_icon = IsReagentBankUnlocked() and MOD.media.reagentIcon or MOD.media.purchaseIcon frame.swapButton = CreateFrame("Button", nil, frame) - frame.swapButton:ModPoint("TOPRIGHT", frame, "TOPRIGHT", -40, -10) - frame.swapButton:ModSize(25, 25) + frame.swapButton:SetPoint("TOPRIGHT", frame, "TOPRIGHT", -40, -10) + frame.swapButton:SetSize(25, 25) StyleBagToolButton(frame.swapButton, active_icon) frame.swapButton.ttText = L["Toggle Reagents Bank"] frame.swapButton:SetScript("OnEnter", function(self) @@ -1546,8 +1546,8 @@ do frame.stackButton:SetScript("OnClick", Stack_OnClick) frame.transferButton = CreateFrame("Button", nil, frame) - frame.transferButton:ModPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) - frame.transferButton:ModSize(25, 25) + frame.transferButton:SetPoint("LEFT", frame.stackButton, "RIGHT", 10, 0) + frame.transferButton:SetSize(25, 25) StyleBagToolButton(frame.transferButton, MOD.media.depositIcon) frame.transferButton.ttText = L["Deposit All Reagents"] frame.transferButton:SetScript("OnEnter", Tooltip_Show) @@ -1599,14 +1599,14 @@ function MOD:RefreshTokens() frame.bottomOffset = 28; local set = frame.currencyButton; if index == 1 then - set[1]:ModPoint("BOTTOM", set, "BOTTOM", -(set[1].text:GetWidth() / 2), 3) + set[1]:SetPoint("BOTTOM", set, "BOTTOM", -(set[1].text:GetWidth() / 2), 3) elseif index == 2 then - set[1]:ModPoint("BOTTOM", set, "BOTTOM", -set[1].text:GetWidth()-set[1]:GetWidth() / 2, 3) - frame.currencyButton[2]:ModPoint("BOTTOMLEFT", set, "BOTTOM", set[2]:GetWidth() / 2, 3) + set[1]:SetPoint("BOTTOM", set, "BOTTOM", -set[1].text:GetWidth()-set[1]:GetWidth() / 2, 3) + frame.currencyButton[2]:SetPoint("BOTTOMLEFT", set, "BOTTOM", set[2]:GetWidth() / 2, 3) else - set[1]:ModPoint("BOTTOMLEFT", set, "BOTTOMLEFT", 3, 3) - set[2]:ModPoint("BOTTOM", set, "BOTTOM", -(set[2].text:GetWidth() / 3), 3) - set[3]:ModPoint("BOTTOMRIGHT", set, "BOTTOMRIGHT", -set[3].text:GetWidth()-set[3]:GetWidth() / 2, 3) + set[1]:SetPoint("BOTTOMLEFT", set, "BOTTOMLEFT", 3, 3) + set[2]:SetPoint("BOTTOM", set, "BOTTOM", -(set[2].text:GetWidth() / 3), 3) + set[3]:SetPoint("BOTTOMRIGHT", set, "BOTTOMRIGHT", -set[3].text:GetWidth()-set[3]:GetWidth() / 2, 3) end end diff --git a/SVUI_Maps/SVUI_Maps.lua b/SVUI_Maps/SVUI_Maps.lua index e619afe..4795d82 100644 --- a/SVUI_Maps/SVUI_Maps.lua +++ b/SVUI_Maps/SVUI_Maps.lua @@ -120,8 +120,8 @@ do if(not SV.db.Maps.minimapbar.enable) then return end MMBBar:SetPoint("CENTER", MMBHolder, "CENTER", 0, 0) - MMBBar:ModHeight(SV.db.Maps.minimapbar.buttonSize + 4) - MMBBar:ModWidth(SV.db.Maps.minimapbar.buttonSize + 4) + MMBBar:SetHeight(SV.db.Maps.minimapbar.buttonSize + 4) + MMBBar:SetWidth(SV.db.Maps.minimapbar.buttonSize + 4) MMBBar:SetFrameStrata("LOW") MMBBar:SetFrameLevel(0) @@ -154,7 +154,7 @@ do btn:ClearAllPoints() btn:SetFrameStrata("LOW") btn:SetFrameLevel(20) - btn:ModSize(SV.db.Maps.minimapbar.buttonSize) + btn:SetSize(SV.db.Maps.minimapbar.buttonSize) if SV.db.Maps.minimapbar.styleType == "HORIZONTAL"then anchor = "RIGHT" relative = "LEFT" @@ -177,9 +177,9 @@ do end if (SV.db.Maps.minimapbar.styleType ~= "NOANCHOR" and (count > 0)) then if SV.db.Maps.minimapbar.styleType == "HORIZONTAL" then - MMBBar:ModWidth((SV.db.Maps.minimapbar.buttonSize * count) + count * 2) + MMBBar:SetWidth((SV.db.Maps.minimapbar.buttonSize * count) + count * 2) else - MMBBar:ModHeight((SV.db.Maps.minimapbar.buttonSize * count) + count * 2) + MMBBar:SetHeight((SV.db.Maps.minimapbar.buttonSize * count) + count * 2) end MMBHolder:SetSize(MMBBar:GetSize()) MMBBar:Show() @@ -230,8 +230,8 @@ do frame:SetTexture("") else frame:ClearAllPoints() - frame:ModPoint("TOPLEFT", btn, "TOPLEFT", 2, -2) - frame:ModPoint("BOTTOMRIGHT", btn, "BOTTOMRIGHT", -2, 2) + frame:SetPoint("TOPLEFT", btn, "TOPLEFT", 2, -2) + frame:SetPoint("BOTTOMRIGHT", btn, "BOTTOMRIGHT", -2, 2) frame:SetTexCoord(0.1, 0.9, 0.1, 0.9 ) frame:SetDrawLayer("ARTWORK") if name == "PS_MinimapButton" then @@ -584,7 +584,7 @@ HOOKS ]]-- local _hook_WorldMapZoneDropDownButton_OnClick = function(self) DropDownList1:ClearAllPoints() - DropDownList1:ModPoint("TOPRIGHT",self,"BOTTOMRIGHT",-17,-4) + DropDownList1:SetPoint("TOPRIGHT",self,"BOTTOMRIGHT",-17,-4) end local _hook_WorldMapFrame_OnShow = function() @@ -695,18 +695,18 @@ function MOD:RefreshMiniMap() local minimapRotationEnabled = GetCVar("rotateMinimap") ~= "0" if(minimapRotationEnabled or (MM_SHAPE == 'ROUND')) then - SV.Dock.TopRight:ModSize(MM_WIDTH, (MM_WIDTH + 4)) - self.Holder:ModSize(MM_WIDTH, MM_WIDTH) - Minimap:ModSize(MM_SIZE,MM_SIZE) + SV.Dock.TopRight:SetSize(MM_WIDTH, (MM_WIDTH + 4)) + self.Holder:SetSize(MM_WIDTH, MM_WIDTH) + Minimap:SetSize(MM_SIZE,MM_SIZE) self.Holder.Square:Hide() self.Holder.Circle:Show() Minimap:SetHitRectInsets(0, 0, 0, 0) Minimap:InsetPoints(self.Holder, MM_BRDR, MM_BRDR) Minimap:SetMaskTexture('Textures\\MinimapMask') else - SV.Dock.TopRight:ModSize(MM_WIDTH, (MM_HEIGHT + 4)) - self.Holder:ModSize(MM_WIDTH, MM_HEIGHT) - Minimap:ModSize(MM_SIZE,MM_SIZE) + SV.Dock.TopRight:SetSize(MM_WIDTH, (MM_HEIGHT + 4)) + self.Holder:SetSize(MM_WIDTH, MM_HEIGHT) + Minimap:SetSize(MM_SIZE,MM_SIZE) self.Holder.Circle:Hide() self.Holder.Square:Show() self.Holder.Square:SetPanelColor(MM_COLOR) @@ -729,7 +729,7 @@ function MOD:RefreshMiniMap() SV.Auras:UpdateAuraHolder(MM_HEIGHT, self.Holder.Grip) end else - SV.Dock.TopRight:ModSize(MM_WIDTH, (MM_HEIGHT + 4)) + SV.Dock.TopRight:SetSize(MM_WIDTH, (MM_HEIGHT + 4)) end self.InfoTop.Text:SetSize(MM_WIDTH,28) @@ -805,8 +805,8 @@ function MOD:Load() Minimap:SetClampedToScreen(false) self.Holder:SetFrameStrata(Minimap:GetFrameStrata()) - self.Holder:ModPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -10, -15) - self.Holder:ModSize(MM_WIDTH, MM_HEIGHT) + self.Holder:SetPoint("TOPRIGHT", SV.Screen, "TOPRIGHT", -10, -15) + self.Holder:SetSize(MM_WIDTH, MM_HEIGHT) self.Holder.Square = CreateFrame("Frame", nil, Minimap) self.Holder.Square:WrapPoints(self.Holder, 2) @@ -841,38 +841,38 @@ function MOD:Load() MinimapZoneTextButton:Hide() MiniMapTracking:Hide() MiniMapMailFrame:ClearAllPoints() - MiniMapMailFrame:ModPoint("TOPRIGHT", self.Holder, 3, 4) + MiniMapMailFrame:SetPoint("TOPRIGHT", self.Holder, 3, 4) MiniMapMailBorder:Hide() MiniMapMailIcon:SetTexture(MOD.media.mailIcon) MiniMapWorldMapButton:Hide() MiniMapInstanceDifficulty:ClearAllPoints() MiniMapInstanceDifficulty:SetParent(Minimap) - MiniMapInstanceDifficulty:ModPoint("LEFT", self.Holder, "LEFT", 0, 0) + MiniMapInstanceDifficulty:SetPoint("LEFT", self.Holder, "LEFT", 0, 0) GuildInstanceDifficulty:ClearAllPoints() GuildInstanceDifficulty:SetParent(Minimap) - GuildInstanceDifficulty:ModPoint("LEFT", self.Holder, "LEFT", 0, 0) + GuildInstanceDifficulty:SetPoint("LEFT", self.Holder, "LEFT", 0, 0) MiniMapChallengeMode:ClearAllPoints() MiniMapChallengeMode:SetParent(Minimap) - MiniMapChallengeMode:ModPoint("LEFT", self.Holder, "LEFT", 12, 0) + MiniMapChallengeMode:SetPoint("LEFT", self.Holder, "LEFT", 12, 0) QueueStatusMinimapButton:ClearAllPoints() - QueueStatusMinimapButton:ModPoint("BOTTOMLEFT", self.Holder, "BOTTOMLEFT", 2, 1) + QueueStatusMinimapButton:SetPoint("BOTTOMLEFT", self.Holder, "BOTTOMLEFT", 2, 1) QueueStatusMinimapButton:SetStyle("Frame", "Default", true, 1, -4, -4) QueueStatusFrame:SetClampedToScreen(true) QueueStatusMinimapButtonBorder:Hide() QueueStatusMinimapButton:SetScript("OnShow", function() - MiniMapInstanceDifficulty:ModPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPLEFT", 0, 0) - GuildInstanceDifficulty:ModPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPLEFT", 0, 0) - MiniMapChallengeMode:ModPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPRIGHT", 0, 0) + MiniMapInstanceDifficulty:SetPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPLEFT", 0, 0) + GuildInstanceDifficulty:SetPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPLEFT", 0, 0) + MiniMapChallengeMode:SetPoint("BOTTOMLEFT", QueueStatusMinimapButton, "TOPRIGHT", 0, 0) end) QueueStatusMinimapButton:SetScript("OnHide", function() - MiniMapInstanceDifficulty:ModPoint("LEFT", self.Holder, "LEFT", 0, 0) - GuildInstanceDifficulty:ModPoint("LEFT", self.Holder, "LEFT", 0, 0) - MiniMapChallengeMode:ModPoint("LEFT", self.Holder, "LEFT", 12, 0) + MiniMapInstanceDifficulty:SetPoint("LEFT", self.Holder, "LEFT", 0, 0) + GuildInstanceDifficulty:SetPoint("LEFT", self.Holder, "LEFT", 0, 0) + MiniMapChallengeMode:SetPoint("LEFT", self.Holder, "LEFT", 12, 0) end) if FeedbackUIButton then @@ -881,7 +881,7 @@ function MOD:Load() local mwfont = SV.media.font.narrator - self.InfoTop:ModPoint("TOPLEFT", self.Holder, "TOPLEFT", 2, -2) + self.InfoTop:SetPoint("TOPLEFT", self.Holder, "TOPLEFT", 2, -2) self.InfoTop:SetSize(100, 22) self.InfoTop:SetStyle("Frame") self.InfoTop:SetPanelColor("yellow") @@ -891,7 +891,7 @@ function MOD:Load() self.InfoTop.Text:SetShadowColor(0, 0, 0, 0.3) self.InfoTop.Text:SetShadowOffset(2, -2) - self.InfoBottom:ModPoint("BOTTOMRIGHT", self.Holder, "BOTTOMRIGHT", 2, -3) + self.InfoBottom:SetPoint("BOTTOMRIGHT", self.Holder, "BOTTOMRIGHT", 2, -3) self.InfoBottom:SetSize(MM_WIDTH, 28) self.InfoBottom:SetFrameLevel(Minimap:GetFrameLevel() + 1) @@ -968,8 +968,8 @@ function MOD:Load() if(SV.db.Maps.minimapbar.enable == true) then MMBHolder = CreateFrame("Frame", "SVUI_MiniMapButtonHolder", self.Holder) - MMBHolder:ModPoint("TOPRIGHT", SV.Dock.TopRight, "BOTTOMRIGHT", 0, -4) - MMBHolder:ModSize(self.Holder:GetWidth(), 32) + MMBHolder:SetPoint("TOPRIGHT", SV.Dock.TopRight, "BOTTOMRIGHT", 0, -4) + MMBHolder:SetSize(self.Holder:GetWidth(), 32) MMBHolder:SetFrameStrata("BACKGROUND") MMBBar = CreateFrame("Frame", "SVUI_MiniMapButtonBar", MMBHolder) MMBBar:SetFrameStrata("LOW") diff --git a/SVUI_NamePlates/SVUI_NamePlates.lua b/SVUI_NamePlates/SVUI_NamePlates.lua index 868e92a..3dfdaa3 100644 --- a/SVUI_NamePlates/SVUI_NamePlates.lua +++ b/SVUI_NamePlates/SVUI_NamePlates.lua @@ -1116,7 +1116,7 @@ do SVUI_PLATE.health.icon:Hide() if SVUI_PLATE.health then SVUI_PLATE.health:SetSize(HBWidth, HBHeight) - plate.cast.icon:ModSize(CBHeight + HBHeight + 5) + plate.cast.icon:SetSize(CBHeight + HBHeight + 5) end if PLATE_AURAS then for index = 1, #PLATE_AURAICONS do @@ -1146,7 +1146,7 @@ do SVUI_PLATE.cast:SetStatusBarTexture(NPBarTex) SVUI_PLATE.cast.text:SetFont(SV.media.font.default, 8, "OUTLINE") plate.cast.text:SetFont(SV.media.font.default, 8, "OUTLINE") - plate.cast.icon:ModSize((CBHeight + HBHeight) + 5) + plate.cast.icon:SetSize((CBHeight + HBHeight) + 5) PLATE_REF.raidicon:ClearAllPoints() SV:SetReversePoint(PLATE_REF.raidicon, RIAnchor, SVUI_PLATE.health, RIXoffset, RIYoffset) PLATE_REF.raidicon:SetSize(RISize, RISize) @@ -1329,7 +1329,7 @@ do cast.sync = frame.cast frame.combo = CreateFrame("Frame", nil, frame.health) - frame.combo:ModPoint("CENTER", frame.health, "BOTTOM") + frame.combo:SetPoint("CENTER", frame.health, "BOTTOM") frame.combo:SetSize(68, 1) frame.combo:Hide() diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.lua b/SVUI_QuestTracker/SVUI_QuestTracker.lua index 49136d0..009df7a 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.lua +++ b/SVUI_QuestTracker/SVUI_QuestTracker.lua @@ -181,8 +181,8 @@ local OBJECTIVE_GetStatus = function(self) status:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", 0, 0); status.Bar = CreateFrame("StatusBar", nil, status); - status.Bar:ModPoint("TOPLEFT", status, "TOPLEFT", 4, -2); - status.Bar:ModPoint("BOTTOMRIGHT", status, "BOTTOMRIGHT", -4, 2); + status.Bar:SetPoint("TOPLEFT", status, "TOPLEFT", 4, -2); + status.Bar:SetPoint("BOTTOMRIGHT", status, "BOTTOMRIGHT", -4, 2); status.Bar:SetStatusBarTexture(SV.media.statusbar.default) status.Bar:SetStatusBarColor(0.15,0.5,1) --1,0.15,0.08 status.Bar:SetMinMaxValues(0, 1) @@ -249,7 +249,7 @@ function MOD:NewObjectiveRow(header, index) local objective = CreateFrame("Frame", nil, header); objective:SetPoint("TOPLEFT", header, "TOPLEFT", 22, -yOffset); objective:SetPoint("TOPRIGHT", header, "TOPRIGHT", 0, -yOffset); - objective:ModHeight(ROW_HEIGHT); + objective:SetHeight(ROW_HEIGHT); objective.Icon = objective:CreateTexture(nil,"OVERLAY"); objective.Icon:SetPoint("TOPLEFT", objective, "TOPLEFT", 4, -2); @@ -260,7 +260,7 @@ function MOD:NewObjectiveRow(header, index) objective.Text = objective:CreateFontString(nil,"OVERLAY"); objective.Text:SetPoint("TOPLEFT", objective, "TOPLEFT", 20 + 6, -2); objective.Text:SetPoint("TOPRIGHT", objective, "TOPRIGHT", 0, -2); - objective.Text:ModHeight(INNER_HEIGHT); + objective.Text:SetHeight(INNER_HEIGHT); objective.Text:SetFontObject(SVUI_Font_Quest); objective.Text:SetJustifyH('LEFT') objective.Text:SetTextColor(0.6,0.6,0.6); @@ -327,7 +327,7 @@ local OBJECTIVE_HEADER_SetInfo = function(self, index, ...) objective.Icon:SetTexture(OBJ_ICON_INCOMPLETE) end objective.Text:SetText(description); - objective:ModHeight(INNER_HEIGHT); + objective:SetHeight(INNER_HEIGHT); objective:FadeIn(); return index; @@ -338,7 +338,7 @@ local OBJECTIVE_HEADER_SetTimer = function(self, index, ...) local objective = self:Get(index); objective.Text:SetText('') - objective:ModHeight(INNER_HEIGHT); + objective:SetHeight(INNER_HEIGHT); objective:FadeIn(); objective:StartTimer(...) @@ -351,7 +351,7 @@ local OBJECTIVE_HEADER_SetProgress = function(self, index, ...) local objective = self:Get(index); objective.Text:SetText('') - objective:ModHeight(INNER_HEIGHT); + objective:SetHeight(INNER_HEIGHT); objective:FadeIn(); objective:StartProgress(...) diff --git a/SVUI_QuestTracker/components/achievements.lua b/SVUI_QuestTracker/components/achievements.lua index 87ee86e..e1a5637 100644 --- a/SVUI_QuestTracker/components/achievements.lua +++ b/SVUI_QuestTracker/components/achievements.lua @@ -140,7 +140,7 @@ local GetAchievementRow = function(self, index) local row = CreateFrame("Frame", nil, self) row:SetPoint("TOPLEFT", anchorFrame, "BOTTOMLEFT", 0, -2); row:SetPoint("TOPRIGHT", anchorFrame, "BOTTOMRIGHT", 0, -2); - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row.Badge = CreateFrame("Frame", nil, row) row.Badge:SetPoint("TOPLEFT", row, "TOPLEFT", 2, -2); @@ -154,7 +154,7 @@ local GetAchievementRow = function(self, index) row.Header = CreateFrame("Frame", nil, row) row.Header:SetPoint("TOPLEFT", row.Badge, "TOPRIGHT", 2, 0); row.Header:SetPoint("TOPRIGHT", row, "TOPRIGHT", -2, 0); - row.Header:ModHeight(INNER_HEIGHT); + row.Header:SetHeight(INNER_HEIGHT); row.Header.Text = row.Header:CreateFontString(nil,"OVERLAY") row.Header.Text:SetFontObject(SVUI_Font_Quest); row.Header.Text:SetJustifyH('LEFT') @@ -175,7 +175,7 @@ local GetAchievementRow = function(self, index) row.Objectives = MOD:NewObjectiveHeader(row); row.Objectives:SetPoint("TOPLEFT", row, "BOTTOMLEFT", 0, 0); row.Objectives:SetPoint("TOPRIGHT", row, "BOTTOMRIGHT", 0, 0); - row.Objectives:ModHeight(1); + row.Objectives:SetHeight(1); row.RowID = 0; self.Rows[index] = row; @@ -200,7 +200,7 @@ local SetAchievementRow = function(self, index, title, details, icon, achievemen row.Badge:SetAlpha(1); row.Button:Enable(); row.Button:SetID(achievementID); - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row:FadeIn(); row.Header:FadeIn(); @@ -240,7 +240,7 @@ local SetAchievementRow = function(self, index, title, details, icon, achievemen end if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); objective_block:FadeIn(); end @@ -272,7 +272,7 @@ local RefreshAchievements = function(self, event, ...) self.Header:SetAlpha(0); self:SetAlpha(0); else - self:ModHeight(fill_height + 2); + self:SetHeight(fill_height + 2); self.Header.Text:SetText(TRACKER_HEADER_ACHIEVEMENTS); self:FadeIn(); self.Header:FadeIn(); @@ -316,13 +316,13 @@ function MOD:InitializeAchievements() local achievements = CreateFrame("Frame", nil, scrollChild) achievements:SetWidth(ROW_WIDTH); - achievements:ModHeight(ROW_HEIGHT); + achievements:SetHeight(ROW_HEIGHT); achievements:SetPoint("TOPLEFT", self.Headers["Quests"], "BOTTOMLEFT", 0, -6); achievements.Header = CreateFrame("Frame", nil, achievements) achievements.Header:SetPoint("TOPLEFT", achievements, "TOPLEFT", 2, -2); achievements.Header:SetPoint("TOPRIGHT", achievements, "TOPRIGHT", -2, -2); - achievements.Header:ModHeight(INNER_HEIGHT); + achievements.Header:SetHeight(INNER_HEIGHT); achievements.Header.Text = achievements.Header:CreateFontString(nil,"OVERLAY") achievements.Header.Text:SetPoint("TOPLEFT", achievements.Header, "TOPLEFT", 2, 0); diff --git a/SVUI_QuestTracker/components/active.lua b/SVUI_QuestTracker/components/active.lua index c71c7b4..921273f 100644 --- a/SVUI_QuestTracker/components/active.lua +++ b/SVUI_QuestTracker/components/active.lua @@ -238,14 +238,14 @@ local SetActiveData = function(self, title, level, icon, questID, questLogIndex, end if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); objective_block:FadeIn(); fill_height = fill_height + ((INNER_HEIGHT + 4) + (LARGE_INNER_HEIGHT)); else fill_height = fill_height + LARGE_INNER_HEIGHT + 12; end - block:ModHeight(fill_height); + block:SetHeight(fill_height); MOD.Docklet.ScrollFrame.ScrollBar:SetValue(0); @@ -349,13 +349,13 @@ function MOD:InitializeActive() active:SetPoint("TOPLEFT", self.Headers["Popups"], "BOTTOMLEFT", 0, 0); local block = CreateFrame("Frame", nil, active) - block:ModPoint("TOPLEFT", active, "TOPLEFT", 2, -4); - block:ModPoint("TOPRIGHT", active, "TOPRIGHT", -2, -4); - block:ModHeight(LARGE_INNER_HEIGHT); + block:SetPoint("TOPLEFT", active, "TOPLEFT", 2, -4); + block:SetPoint("TOPRIGHT", active, "TOPRIGHT", -2, -4); + block:SetHeight(LARGE_INNER_HEIGHT); block.Button = CreateFrame("Button", nil, block) - block.Button:ModPoint("TOPLEFT", block, "TOPLEFT", 0, 0); - block.Button:ModPoint("BOTTOMRIGHT", block, "BOTTOMRIGHT", 0, 8); + block.Button:SetPoint("TOPLEFT", block, "TOPLEFT", 0, 0); + block.Button:SetPoint("BOTTOMRIGHT", block, "BOTTOMRIGHT", 0, 8); block.Button:SetStyle("DockButton", "Transparent") block.Button:SetBackdropBorderColor(0, 0.9, 0, 0.5) block.Button:SetID(0) @@ -371,14 +371,14 @@ function MOD:InitializeActive() block.CloseButton:SetNormalTexture(SV.media.icon.close) block.CloseButton:HookScript("OnEnter", CloseButton_OnEnter) block.CloseButton:HookScript("OnLeave", CloseButton_OnLeave) - block.CloseButton:ModPoint("TOPRIGHT", block.Button, "TOPRIGHT", 4, 4); + block.CloseButton:SetPoint("TOPRIGHT", block.Button, "TOPRIGHT", 4, 4); block.CloseButton:RegisterForClicks("LeftButtonUp", "RightButtonUp") block.CloseButton.Parent = active; block.CloseButton:SetScript("OnClick", ActiveButton_OnClick) block.Badge = CreateFrame("Frame", nil, block.Button) - block.Badge:ModPoint("TOPLEFT", block.Button, "TOPLEFT", 4, -4); - block.Badge:ModSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); + block.Badge:SetPoint("TOPLEFT", block.Button, "TOPLEFT", 4, -4); + block.Badge:SetSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); block.Badge:SetStyle("!_Frame", "Inset") block.Badge.Icon = block.Badge:CreateTexture(nil,"OVERLAY") @@ -389,43 +389,43 @@ function MOD:InitializeActive() block.Header = CreateFrame("Frame", nil, block) block.Header:SetPoint("TOPLEFT", block.Badge, "TOPRIGHT", 4, 0); block.Header:SetPoint("TOPRIGHT", block.Button, "TOPRIGHT", -24, -4); - block.Header:ModHeight(INNER_HEIGHT - 2); + block.Header:SetHeight(INNER_HEIGHT - 2); block.Header:SetStyle("Frame") block.Header.Level = block.Header:CreateFontString(nil,"OVERLAY") block.Header.Level:SetFontObject(SVUI_Font_Quest); block.Header.Level:SetJustifyH('LEFT') block.Header.Level:SetText('') - block.Header.Level:ModPoint("TOPLEFT", block.Header, "TOPLEFT", 4, 0); - block.Header.Level:ModPoint("BOTTOMLEFT", block.Header, "BOTTOMLEFT", 4, 0); + block.Header.Level:SetPoint("TOPLEFT", block.Header, "TOPLEFT", 4, 0); + block.Header.Level:SetPoint("BOTTOMLEFT", block.Header, "BOTTOMLEFT", 4, 0); block.Header.Text = block.Header:CreateFontString(nil,"OVERLAY") block.Header.Text:SetFontObject(SVUI_Font_Quest); block.Header.Text:SetJustifyH('LEFT') block.Header.Text:SetTextColor(1,1,0) block.Header.Text:SetText('') - block.Header.Text:ModPoint("TOPLEFT", block.Header.Level, "TOPRIGHT", 4, 0); - block.Header.Text:ModPoint("BOTTOMRIGHT", block.Header, "BOTTOMRIGHT", 0, 0); + block.Header.Text:SetPoint("TOPLEFT", block.Header.Level, "TOPRIGHT", 4, 0); + block.Header.Text:SetPoint("BOTTOMRIGHT", block.Header, "BOTTOMRIGHT", 0, 0); block.Details = CreateFrame("Frame", nil, block.Header) - block.Details:ModPoint("TOPLEFT", block.Header, "BOTTOMLEFT", 0, -2); - block.Details:ModPoint("TOPRIGHT", block.Header, "BOTTOMRIGHT", 0, -2); + block.Details:SetPoint("TOPLEFT", block.Header, "BOTTOMLEFT", 0, -2); + block.Details:SetPoint("TOPRIGHT", block.Header, "BOTTOMRIGHT", 0, -2); if(SV.AddQuestCompass) then - block.Details:ModHeight(INNER_HEIGHT - 4); + block.Details:SetHeight(INNER_HEIGHT - 4); SV:AddQuestCompass(block, block.Badge) block.Badge.Compass.Range:ClearAllPoints() - block.Badge.Compass.Range:ModPoint("TOPLEFT", block.Details, "TOPLEFT", 4, 0); - block.Badge.Compass.Range:ModPoint("BOTTOMLEFT", block.Details, "BOTTOMLEFT", 4, 0); + block.Badge.Compass.Range:SetPoint("TOPLEFT", block.Details, "TOPLEFT", 4, 0); + block.Badge.Compass.Range:SetPoint("BOTTOMLEFT", block.Details, "BOTTOMLEFT", 4, 0); block.Badge.Compass.Range:SetJustifyH("LEFT"); else - block.Details:ModHeight(1); + block.Details:SetHeight(1); end block.Objectives = MOD:NewObjectiveHeader(block); - block.Objectives:ModPoint("TOPLEFT", block.Details, "BOTTOMLEFT", 0, -2); - block.Objectives:ModPoint("TOPRIGHT", block.Details, "BOTTOMRIGHT", 0, -2); - block.Objectives:ModHeight(1); + block.Objectives:SetPoint("TOPLEFT", block.Details, "BOTTOMLEFT", 0, -2); + block.Objectives:SetPoint("TOPRIGHT", block.Details, "BOTTOMRIGHT", 0, -2); + block.Objectives:SetHeight(1); active.Block = block; diff --git a/SVUI_QuestTracker/components/bonus.lua b/SVUI_QuestTracker/components/bonus.lua index 6af3399..c1854bc 100644 --- a/SVUI_QuestTracker/components/bonus.lua +++ b/SVUI_QuestTracker/components/bonus.lua @@ -225,25 +225,25 @@ local GetBonusRow = function(self, index) row:SetPoint("TOPLEFT", self, "TOPLEFT", 0, 0); row:SetPoint("TOPRIGHT", self, "TOPRIGHT", 0, 0); end - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row.Header = CreateFrame("Frame", nil, row) - row.Header:ModPoint("TOPLEFT", row, "TOPLEFT", 2, -2); - row.Header:ModPoint("TOPRIGHT", row, "TOPRIGHT", -2, -2); - row.Header:ModHeight(INNER_HEIGHT); + row.Header:SetPoint("TOPLEFT", row, "TOPLEFT", 2, -2); + row.Header:SetPoint("TOPRIGHT", row, "TOPRIGHT", -2, -2); + row.Header:SetHeight(INNER_HEIGHT); row.Header.Text = row.Header:CreateFontString(nil,"OVERLAY") row.Header.Text:SetFontObject(SVUI_Font_Quest_Header); row.Header.Text:SetJustifyH('LEFT') row.Header.Text:SetTextColor(0.2,0.75,1) row.Header.Text:SetText('') - row.Header.Text:ModPoint("TOPLEFT", row.Header, "TOPLEFT", 0, 0); - row.Header.Text:ModPoint("BOTTOMRIGHT", row.Header, "BOTTOMRIGHT", 0, 0); + row.Header.Text:SetPoint("TOPLEFT", row.Header, "TOPLEFT", 0, 0); + row.Header.Text:SetPoint("BOTTOMRIGHT", row.Header, "BOTTOMRIGHT", 0, 0); row.Objectives = MOD:NewObjectiveHeader(row); - row.Objectives:ModPoint("TOPLEFT", row, "BOTTOMLEFT", 0, 0); - row.Objectives:ModPoint("TOPRIGHT", row, "BOTTOMRIGHT", 0, 0); - row.Objectives:ModHeight(1); + row.Objectives:SetPoint("TOPLEFT", row, "BOTTOMLEFT", 0, 0); + row.Objectives:SetPoint("TOPRIGHT", row, "BOTTOMRIGHT", 0, 0); + row.Objectives:SetHeight(1); row.RowID = 0; @@ -264,7 +264,7 @@ local SetCriteriaRow = function(self, index, bonusStepIndex, subCount, hasFailed local row = self:Get(index); row.RowID = 0 row.Header.Text:SetText(TRACKER_HEADER_BONUS_OBJECTIVES) - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row:SetAlpha(1); local objective_block = row.Objectives; @@ -292,7 +292,7 @@ local SetCriteriaRow = function(self, index, bonusStepIndex, subCount, hasFailed end if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); end fill_height = fill_height + (ROW_HEIGHT + 2); @@ -324,11 +324,11 @@ local SetBonusRow = function(self, index, questID, subCount) if(not iscomplete) then row.RowID = questID row.Header.Text:SetText(TRACKER_HEADER_BONUS_OBJECTIVES) - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row:FadeIn(); if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); end fill_height = fill_height + (ROW_HEIGHT + 2); @@ -407,7 +407,7 @@ local UpdateBonusObjectives = function(self) self:SetAlpha(0); self:Reset(); else - self:ModHeight(fill_height + 2); + self:SetHeight(fill_height + 2); self:FadeIn(); end end diff --git a/SVUI_QuestTracker/components/button.lua b/SVUI_QuestTracker/components/button.lua index 797563a..7376f4a 100644 --- a/SVUI_QuestTracker/components/button.lua +++ b/SVUI_QuestTracker/components/button.lua @@ -125,8 +125,8 @@ PACKAGE CALL ]]-- function MOD:InitializeQuestItem() SVUI_QuestItemBar:SetParent(SV.Screen) - SVUI_QuestItemBar:ModPoint("BOTTOM", SV.Screen, "BOTTOM", 0, 250) - SVUI_QuestItemBar:ModSize(40,40) + SVUI_QuestItemBar:SetPoint("BOTTOM", SV.Screen, "BOTTOM", 0, 250) + SVUI_QuestItemBar:SetSize(40,40) SV:NewAnchor(SVUI_QuestItemBar, L["Quest Item Button"]) diff --git a/SVUI_QuestTracker/components/popups.lua b/SVUI_QuestTracker/components/popups.lua index 09ab460..9ddc448 100644 --- a/SVUI_QuestTracker/components/popups.lua +++ b/SVUI_QuestTracker/components/popups.lua @@ -99,34 +99,34 @@ local GetPopUpRow = function(self, index) row:SetPoint("TOPLEFT", self, "TOPLEFT", 0, -2); row:SetPoint("TOPRIGHT", self, "TOPRIGHT", 0, -2); end - row:ModHeight(LARGE_ROW_HEIGHT); + row:SetHeight(LARGE_ROW_HEIGHT); row.Button = CreateFrame("Button", nil, row) - row.Button:ModPoint("TOPLEFT", row, "TOPLEFT", 0, 0); - row.Button:ModPoint("BOTTOMRIGHT", row, "BOTTOMRIGHT", 0, 0); + row.Button:SetPoint("TOPLEFT", row, "TOPLEFT", 0, 0); + row.Button:SetPoint("BOTTOMRIGHT", row, "BOTTOMRIGHT", 0, 0); row.Button:SetStyle("DockButton") row.Button:SetPanelColor("yellow") row.Button:SetID(0) row.Button.PopUpType = nil; row.Button:SetScript("OnClick", PopUpButton_OnClick) row.Badge = CreateFrame("Frame", nil, row.Button) - row.Badge:ModPoint("TOPLEFT", row.Button, "TOPLEFT", 4, -4); - row.Badge:ModSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); + row.Badge:SetPoint("TOPLEFT", row.Button, "TOPLEFT", 4, -4); + row.Badge:SetSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); row.Badge:SetStyle("!_Frame", "Inset") row.Badge.Icon = row.Badge:CreateTexture(nil,"OVERLAY") row.Badge.Icon:InsetPoints(row.Badge); row.Badge.Icon:SetTexture(MOD.media.incompleteIcon) row.Badge.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) row.Header = CreateFrame("Frame", nil, row.Button) - row.Header:ModPoint("TOPLEFT", row.Badge, "TOPRIGHT", 4, -1); - row.Header:ModPoint("BOTTOMRIGHT", row.Button, "BOTTOMRIGHT", -2, 2); + row.Header:SetPoint("TOPLEFT", row.Badge, "TOPRIGHT", 4, -1); + row.Header:SetPoint("BOTTOMRIGHT", row.Button, "BOTTOMRIGHT", -2, 2); row.Header:SetStyle("Frame") row.Header.Text = row.Header:CreateFontString(nil,"OVERLAY") row.Header.Text:SetFontObject(SVUI_Font_Quest); row.Header.Text:SetJustifyH('LEFT') row.Header.Text:SetTextColor(1,1,0) row.Header.Text:SetText('') - row.Header.Text:ModPoint("TOPLEFT", row.Header, "TOPLEFT", 0, 0); - row.Header.Text:ModPoint("BOTTOMRIGHT", row.Header, "BOTTOMRIGHT", 0, 0); + row.Header.Text:SetPoint("TOPLEFT", row.Header, "TOPLEFT", 0, 0); + row.Header.Text:SetPoint("BOTTOMRIGHT", row.Header, "BOTTOMRIGHT", 0, 0); row.RowID = 0; self.Rows[index] = row; return row; @@ -147,7 +147,7 @@ local SetPopupRow = function(self, index, title, popUpType, questID, questLogInd row.Button:Enable(); row.Button.PopUpType = popUpType; row.Button:SetID(questLogIndex); - row:ModHeight(LARGE_ROW_HEIGHT); + row:SetHeight(LARGE_ROW_HEIGHT); row:FadeIn(); local fill_height = LARGE_ROW_HEIGHT + 6; @@ -175,7 +175,7 @@ local RefreshPopupObjective = function(self, event, ...) self:SetHeight(1); self:SetAlpha(0); else - self:ModHeight(fill_height + 2); + self:SetHeight(fill_height + 2); self:FadeIn(); end end diff --git a/SVUI_QuestTracker/components/quests.lua b/SVUI_QuestTracker/components/quests.lua index 3bac03f..147d602 100644 --- a/SVUI_QuestTracker/components/quests.lua +++ b/SVUI_QuestTracker/components/quests.lua @@ -240,7 +240,7 @@ do local itembutton = CreateFrame('Button', buttonName, UIParent, 'SecureActionButtonTemplate, SecureHandlerStateTemplate, SecureHandlerAttributeTemplate'); itembutton:SetAlpha(0); itembutton:SetStyle("Icon"); - itembutton:ModSize(28, 28); + itembutton:SetSize(28, 28); itembutton:SetID(index); itembutton.___overflow = false; itembutton.SetUsage = Button_SetItem; @@ -672,7 +672,7 @@ local StartTimer = function(self, duration, elapsed) local startTime = timeNow - elapsed; local timeRemaining = duration - startTime; - self.Timer:ModHeight(INNER_HEIGHT); + self.Timer:SetHeight(INNER_HEIGHT); self.Timer:FadeIn(); self.Timer.Bar.duration = duration or 1; self.Timer.Bar.startTime = startTime; @@ -714,11 +714,11 @@ local GetQuestRow = function(self, index) local row = CreateFrame("Frame", nil, self) row:SetPoint("TOPLEFT", anchorFrame, "BOTTOMLEFT", 0, yOffset); row:SetPoint("TOPRIGHT", anchorFrame, "BOTTOMRIGHT", 0, yOffset); - row:ModHeight(QUEST_ROW_HEIGHT); + row:SetHeight(QUEST_ROW_HEIGHT); row.Badge = CreateFrame("Frame", nil, row) row.Badge:SetPoint("TOPLEFT", row, "TOPLEFT", 0, 0); - row.Badge:ModSize(QUEST_ROW_HEIGHT, QUEST_ROW_HEIGHT); + row.Badge:SetSize(QUEST_ROW_HEIGHT, QUEST_ROW_HEIGHT); row.Badge:SetStyle("Frame", "Lite") row.Badge.Icon = row.Badge:CreateTexture(nil,"OVERLAY") @@ -739,7 +739,7 @@ local GetQuestRow = function(self, index) row.Header = CreateFrame("Frame", nil, row) row.Header:SetPoint("TOPLEFT", row, "TOPLEFT", (QUEST_ROW_HEIGHT + 6), 0); row.Header:SetPoint("TOPRIGHT", row, "TOPRIGHT", -2, 0); - row.Header:ModHeight(INNER_HEIGHT); + row.Header:SetHeight(INNER_HEIGHT); row.Header.Level = row.Header:CreateFontString(nil,"OVERLAY") row.Header.Level:SetFontObject(SVUI_Font_Quest_Number); @@ -766,7 +766,7 @@ local GetQuestRow = function(self, index) row.Button = CreateFrame("Button", nil, row.Header) row.Button:SetPoint("TOPLEFT", row, "TOPLEFT", (QUEST_ROW_HEIGHT + 6), 0); row.Button:SetPoint("TOPRIGHT", row, "TOPRIGHT", -2, 0); - row.Button:ModHeight(INNER_HEIGHT + 2); + row.Button:SetHeight(INNER_HEIGHT + 2); row.Button:SetStyle("LiteButton") row.Button:SetID(0) row.Button:RegisterForClicks("LeftButtonUp", "RightButtonUp") @@ -775,13 +775,13 @@ local GetQuestRow = function(self, index) row.Button:SetScript("OnLeave", AnyButton_OnLeave) row.Timer = CreateFrame("Frame", nil, row) - row.Timer:ModPoint("TOPLEFT", row, "BOTTOMLEFT", 0, 4); - row.Timer:ModPoint("TOPRIGHT", row, "BOTTOMRIGHT", 0, 4); - row.Timer:ModHeight(INNER_HEIGHT); + row.Timer:SetPoint("TOPLEFT", row, "BOTTOMLEFT", 0, 4); + row.Timer:SetPoint("TOPRIGHT", row, "BOTTOMRIGHT", 0, 4); + row.Timer:SetHeight(INNER_HEIGHT); row.Timer.Bar = CreateFrame("StatusBar", nil, row.Timer); - row.Timer.Bar:ModPoint("TOPLEFT", row.Timer, "TOPLEFT", 4, -2); - row.Timer.Bar:ModPoint("BOTTOMRIGHT", row.Timer, "BOTTOMRIGHT", -4, 2); + row.Timer.Bar:SetPoint("TOPLEFT", row.Timer, "TOPLEFT", 4, -2); + row.Timer.Bar:SetPoint("BOTTOMRIGHT", row.Timer, "BOTTOMRIGHT", -4, 2); row.Timer.Bar:SetStatusBarTexture(SV.media.statusbar.default) row.Timer.Bar:SetStatusBarColor(0.5,0,1) --1,0.15,0.08 row.Timer.Bar:SetMinMaxValues(0, 1) @@ -878,7 +878,7 @@ local SetQuestRow = function(self, index, watchIndex, title, level, icon, questI row.Button:SetAlpha(1); row.Button:Enable(); row.Button:SetID(questLogIndex); - row:ModHeight(QUEST_ROW_HEIGHT); + row:SetHeight(QUEST_ROW_HEIGHT); row:FadeIn(); local objective_block = row.Objectives; @@ -901,7 +901,7 @@ local SetQuestRow = function(self, index, watchIndex, title, level, icon, questI end if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); objective_block:FadeIn(); end @@ -924,7 +924,7 @@ local SetZoneHeader = function(self, index, zoneName) row.Badge.Button:Disable(); row.Header.Zone:SetTextColor(1,0.31,0.1) row.Header.Zone:SetText(zoneName); - row:ModHeight(ROW_HEIGHT); + row:SetHeight(ROW_HEIGHT); row:SetAlpha(1); local objective_block = row.Objectives; @@ -961,7 +961,7 @@ local RefreshQuests = function(self, event, ...) self:SetHeight(1); self:SetAlpha(0); else - self:ModHeight(fill_height + 2); + self:SetHeight(fill_height + 2); self:FadeIn(); end @@ -982,7 +982,7 @@ local AddOneQuest = function(self, questID) end end - self:ModHeight(fill_height + 2); + self:SetHeight(fill_height + 2); end ItemBar:Update() @@ -1131,11 +1131,11 @@ function MOD:InitializeQuests() ItemBar:ClearAllPoints(); ItemBar:SetParent(SV.Screen); if(SV.db.QuestTracker.itemBarDirection == 'HORIZONTAL') then - ItemBar:ModPoint("BOTTOMLEFT", SV.Dock.BottomRight, "TOPLEFT", 0, 4); + ItemBar:SetPoint("BOTTOMLEFT", SV.Dock.BottomRight, "TOPLEFT", 0, 4); ItemBar:SetWidth(SV.Dock.BottomRight:GetWidth()); ItemBar:SetHeight(32); else - ItemBar:ModPoint("TOPRIGHT", SV.Dock.BottomRight, "TOPLEFT", -4, 0); + ItemBar:SetPoint("TOPRIGHT", SV.Dock.BottomRight, "TOPLEFT", -4, 0); ItemBar:SetWidth(32); ItemBar:SetHeight(SV.Dock.BottomRight:GetHeight()); end @@ -1151,14 +1151,14 @@ function MOD:InitializeQuests() local scrollChild = self.Docklet.ScrollFrame.ScrollChild; local quests = CreateFrame("Frame", nil, scrollChild) quests:SetWidth(ROW_WIDTH); - quests:ModHeight(ROW_HEIGHT); + quests:SetHeight(ROW_HEIGHT); quests:SetPoint("TOPLEFT", self.Headers["Bonus"], "BOTTOMLEFT", 0, -4); --quests:SetStyle() quests.Header = CreateFrame("Frame", nil, quests) quests.Header:SetPoint("TOPLEFT", quests, "TOPLEFT", 2, -2); quests.Header:SetPoint("TOPRIGHT", quests, "TOPRIGHT", -2, -2); - quests.Header:ModHeight(INNER_HEIGHT); + quests.Header:SetHeight(INNER_HEIGHT); quests.Header.Text = quests.Header:CreateFontString(nil,"OVERLAY") quests.Header.Text:SetPoint("TOPLEFT", quests.Header, "TOPLEFT", 2, 0); diff --git a/SVUI_QuestTracker/components/scenario.lua b/SVUI_QuestTracker/components/scenario.lua index c9a5ffd..6ff6502 100644 --- a/SVUI_QuestTracker/components/scenario.lua +++ b/SVUI_QuestTracker/components/scenario.lua @@ -127,12 +127,12 @@ local SetScenarioData = function(self, title, stageName, currentStage, numStages local timerHeight = self.Timer:GetHeight() if(objective_rows > 0) then - objective_block:ModHeight(fill_height); + objective_block:SetHeight(fill_height); objective_block:FadeIn(); end fill_height = fill_height + (LARGE_ROW_HEIGHT + 2) + timerHeight; - block:ModHeight(fill_height); + block:SetHeight(fill_height); MOD.Docklet.ScrollFrame.ScrollBar:SetValue(0) end @@ -367,14 +367,14 @@ function MOD:InitializeScenarios() scenario.RefreshHeight = RefreshScenarioHeight; local block = CreateFrame("Frame", nil, scenario) - block:ModPoint("TOPLEFT", scenario, "TOPLEFT", 2, -2); - block:ModPoint("TOPRIGHT", scenario, "TOPRIGHT", -2, -2); + block:SetPoint("TOPLEFT", scenario, "TOPLEFT", 2, -2); + block:SetPoint("TOPRIGHT", scenario, "TOPRIGHT", -2, -2); block:SetHeight(1); block:SetStyle("Frame", "Lite"); block.Badge = CreateFrame("Frame", nil, block) - block.Badge:ModPoint("TOPLEFT", block, "TOPLEFT", 4, -4); - block.Badge:ModSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); + block.Badge:SetPoint("TOPLEFT", block, "TOPLEFT", 4, -4); + block.Badge:SetSize((LARGE_INNER_HEIGHT - 4), (LARGE_INNER_HEIGHT - 4)); block.Badge:SetStyle("!_Frame", "Inset") block.Icon = block.Badge:CreateTexture(nil,"OVERLAY") @@ -383,36 +383,36 @@ function MOD:InitializeScenarios() block.Icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) block.Header = CreateFrame("Frame", nil, block) - block.Header:ModPoint("TOPLEFT", block.Badge, "TOPRIGHT", 4, -1); - block.Header:ModPoint("TOPRIGHT", block, "TOPRIGHT", -4, 0); - block.Header:ModHeight(INNER_HEIGHT); + block.Header:SetPoint("TOPLEFT", block.Badge, "TOPRIGHT", 4, -1); + block.Header:SetPoint("TOPRIGHT", block, "TOPRIGHT", -4, 0); + block.Header:SetHeight(INNER_HEIGHT); block.Header:SetStyle("Frame") block.Header.Stage = block.Header:CreateFontString(nil,"OVERLAY") block.Header.Stage:SetFontObject(SVUI_Font_Quest); block.Header.Stage:SetJustifyH('LEFT') block.Header.Stage:SetText('') - block.Header.Stage:ModPoint("TOPLEFT", block.Header, "TOPLEFT", 4, 0); - block.Header.Stage:ModPoint("BOTTOMLEFT", block.Header, "BOTTOMLEFT", 4, 0); + block.Header.Stage:SetPoint("TOPLEFT", block.Header, "TOPLEFT", 4, 0); + block.Header.Stage:SetPoint("BOTTOMLEFT", block.Header, "BOTTOMLEFT", 4, 0); block.Header.Score = block.Header:CreateFontString(nil,"OVERLAY") block.Header.Score:SetFontObject(SVUI_Font_Quest); block.Header.Score:SetJustifyH('RIGHT') block.Header.Score:SetTextColor(1,1,0) block.Header.Score:SetText('') - block.Header.Score:ModPoint("TOPRIGHT", block.Header, "TOPRIGHT", -2, 0); - block.Header.Score:ModPoint("BOTTOMRIGHT", block.Header, "BOTTOMRIGHT", -2, 0); + block.Header.Score:SetPoint("TOPRIGHT", block.Header, "TOPRIGHT", -2, 0); + block.Header.Score:SetPoint("BOTTOMRIGHT", block.Header, "BOTTOMRIGHT", -2, 0); block.Header.Text = block.Header:CreateFontString(nil,"OVERLAY") block.Header.Text:SetFontObject(SVUI_Font_Quest); block.Header.Text:SetTextColor(1,1,0) block.Header.Text:SetText('') - block.Header.Text:ModPoint("TOPLEFT", block.Header.Stage, "TOPRIGHT", 4, 0); - block.Header.Text:ModPoint("BOTTOMRIGHT", block.Header.Score, "BOTTOMRIGHT", 0, 0); + block.Header.Text:SetPoint("TOPLEFT", block.Header.Stage, "TOPRIGHT", 4, 0); + block.Header.Text:SetPoint("BOTTOMRIGHT", block.Header.Score, "BOTTOMRIGHT", 0, 0); local timer = CreateFrame("Frame", nil, block.Header) - timer:ModPoint("TOPLEFT", block.Header, "BOTTOMLEFT", 4, -4); - timer:ModPoint("TOPRIGHT", block.Header, "BOTTOMRIGHT", -4, -4); + timer:SetPoint("TOPLEFT", block.Header, "BOTTOMLEFT", 4, -4); + timer:SetPoint("TOPRIGHT", block.Header, "BOTTOMRIGHT", -4, -4); timer:SetHeight(INNER_HEIGHT); timer:SetStyle("!_Frame", "Bar"); @@ -431,16 +431,16 @@ function MOD:InitializeScenarios() timer.Bar:SetValue(0) timer.Bar.Wave = timer.Bar:CreateFontString(nil,"OVERLAY") - timer.Bar.Wave:ModPoint("TOPLEFT", timer.Bar, "TOPLEFT", 4, 0); - timer.Bar.Wave:ModPoint("BOTTOMLEFT", timer.Bar, "BOTTOMLEFT", 4, 0); + timer.Bar.Wave:SetPoint("TOPLEFT", timer.Bar, "TOPLEFT", 4, 0); + timer.Bar.Wave:SetPoint("BOTTOMLEFT", timer.Bar, "BOTTOMLEFT", 4, 0); timer.Bar.Wave:SetFontObject(SVUI_Font_Quest); timer.Bar.Wave:SetJustifyH('LEFT') timer.Bar.Wave:SetTextColor(1,1,0) timer.Bar.Wave:SetText('') timer.Bar.TimeLeft = timer.Bar:CreateFontString(nil,"OVERLAY"); - timer.Bar.TimeLeft:ModPoint("TOPLEFT", timer.Bar.Wave, "TOPRIGHT", 4, 0); - timer.Bar.TimeLeft:ModPoint("BOTTOMRIGHT", timer.Bar, "BOTTOMRIGHT", 0, 0); + timer.Bar.TimeLeft:SetPoint("TOPLEFT", timer.Bar.Wave, "TOPRIGHT", 4, 0); + timer.Bar.TimeLeft:SetPoint("BOTTOMRIGHT", timer.Bar, "BOTTOMRIGHT", 0, 0); timer.Bar.TimeLeft:SetFontObject(SVUI_Font_Quest_Number); timer.Bar.TimeLeft:SetTextColor(1,1,1) timer.Bar.TimeLeft:SetText('') @@ -450,9 +450,9 @@ function MOD:InitializeScenarios() timer:SetAlpha(0) block.Objectives = MOD:NewObjectiveHeader(block); - block.Objectives:ModPoint("TOPLEFT", timer, "BOTTOMLEFT", -4, -4); - block.Objectives:ModPoint("TOPRIGHT", timer, "BOTTOMRIGHT", 4, -4); - block.Objectives:ModHeight(1); + block.Objectives:SetPoint("TOPLEFT", timer, "BOTTOMLEFT", -4, -4); + block.Objectives:SetPoint("TOPRIGHT", timer, "BOTTOMRIGHT", 4, -4); + block.Objectives:SetHeight(1); block.HasData = false; diff --git a/SVUI_Skins/components/addons/ACP.lua b/SVUI_Skins/components/addons/ACP.lua index 463cb86..e9ebf45 100644 --- a/SVUI_Skins/components/addons/ACP.lua +++ b/SVUI_Skins/components/addons/ACP.lua @@ -75,21 +75,21 @@ local function StyleACP() ACP_AddonList_NoRecurse:SetStyle("Checkbox") SV.API:Set("ScrollFrame", ACP_AddonList_ScrollFrameScrollBar) SV.API:Set("DropDown", ACP_AddonListSortDropDown) - ACP_AddonListSortDropDown:ModWidth(130) + ACP_AddonListSortDropDown:SetWidth(130) ACP_AddonList_ScrollFrame:SetWidth(590) ACP_AddonList_ScrollFrame:SetHeight(412) ACP_AddonList:SetHeight(502) - ACP_AddonListEntry1:ModPoint("TOPLEFT",ACP_AddonList,"TOPLEFT",47,-62) - ACP_AddonList_ScrollFrame:ModPoint("TOPLEFT",ACP_AddonList,"TOPLEFT",20,-53) - ACP_AddonListCloseButton:ModPoint("TOPRIGHT",ACP_AddonList,"TOPRIGHT",4,5) - ACP_AddonListSetButton:ModPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",20,8) + ACP_AddonListEntry1:SetPoint("TOPLEFT",ACP_AddonList,"TOPLEFT",47,-62) + ACP_AddonList_ScrollFrame:SetPoint("TOPLEFT",ACP_AddonList,"TOPLEFT",20,-53) + ACP_AddonListCloseButton:SetPoint("TOPRIGHT",ACP_AddonList,"TOPRIGHT",4,5) + ACP_AddonListSetButton:SetPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",20,8) ACP_AddonListSetButton:SetHeight(25) - ACP_AddonListDisableAll:ModPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",90,8) + ACP_AddonListDisableAll:SetPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",90,8) ACP_AddonListDisableAll:SetHeight(25) - ACP_AddonListEnableAll:ModPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",175,8) + ACP_AddonListEnableAll:SetPoint("BOTTOMLEFT",ACP_AddonList,"BOTTOMLEFT",175,8) ACP_AddonListEnableAll:SetHeight(25) - ACP_AddonList_ReloadUI:ModPoint("BOTTOMRIGHT",ACP_AddonList,"BOTTOMRIGHT",-160,8) - ACP_AddonListBottomClose:ModPoint("BOTTOMRIGHT",ACP_AddonList,"BOTTOMRIGHT",-50,8) + ACP_AddonList_ReloadUI:SetPoint("BOTTOMRIGHT",ACP_AddonList,"BOTTOMRIGHT",-160,8) + ACP_AddonListBottomClose:SetPoint("BOTTOMRIGHT",ACP_AddonList,"BOTTOMRIGHT",-50,8) ACP_AddonListBottomClose:SetHeight(25)ACP_AddonList:SetParent(UIParent) end diff --git a/SVUI_Skins/components/addons/Ace3.lua b/SVUI_Skins/components/addons/Ace3.lua index de4f463..085e18a 100644 --- a/SVUI_Skins/components/addons/Ace3.lua +++ b/SVUI_Skins/components/addons/Ace3.lua @@ -133,7 +133,7 @@ local function StyleAceGUI(event, addon) widgetDropdown:RemoveTextures() widgetButton:ClearAllPoints() - widgetButton:ModPoint("RIGHT", widgetDropdown, "RIGHT", -20, 0) + widgetButton:SetPoint("RIGHT", widgetDropdown, "RIGHT", -20, 0) widgetButton:SetFrameLevel(widgetButton:GetFrameLevel() + 1) Widget_PaginationStyle(widgetButton, true) @@ -158,11 +158,11 @@ local function StyleAceGUI(event, addon) SV.API:Set("!_Frame", widgetSlider, "Bar") - widgetSlider:ModHeight(20) + widgetSlider:SetHeight(20) widgetSlider:SetThumbTexture("Interface\\Buttons\\UI-ScrollBar-Knob") widgetSlider:GetThumbTexture():SetVertexColor(0.8, 0.8, 0.8) - widgetEditbox:ModHeight(15) + widgetEditbox:SetHeight(15) widgetEditbox:SetPoint("TOP", widgetSlider, "BOTTOM", 0, -1) widget.lowtext:SetPoint("TOPLEFT", widgetSlider, "BOTTOMLEFT", 2, -2) @@ -175,15 +175,15 @@ local function StyleAceGUI(event, addon) widgetFrame:RemoveTextures() Widget_PaginationStyle(dropButton, true) widgetFrame.text:ClearAllPoints() - widgetFrame.text:ModPoint("RIGHT", dropButton, "LEFT", -2, 0) + widgetFrame.text:SetPoint("RIGHT", dropButton, "LEFT", -2, 0) dropButton:ClearAllPoints() - dropButton:ModPoint("RIGHT", widgetFrame, "RIGHT", -10, -6) + dropButton:SetPoint("RIGHT", widgetFrame, "RIGHT", -10, -6) if(not widgetFrame.Panel) then if(widgetType == "LSM30_Sound") then SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) widget.soundbutton:SetParent(widgetFrame.Panel) widget.soundbutton:ClearAllPoints() - widget.soundbutton:ModPoint("LEFT", widgetFrame.Panel, "LEFT", 2, 0) + widget.soundbutton:SetPoint("LEFT", widgetFrame.Panel, "LEFT", 2, 0) elseif(widgetType == "LSM30_Statusbar") then SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) widget.bar:SetParent(widgetFrame.Panel) @@ -193,7 +193,7 @@ local function StyleAceGUI(event, addon) else SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) end - widgetFrame.Panel:ModPoint("BOTTOMRIGHT", dropButton, "BOTTOMRIGHT", 2, -2) + widgetFrame.Panel:SetPoint("BOTTOMRIGHT", dropButton, "BOTTOMRIGHT", 2, -2) end dropButton:SetParent(widgetFrame.Panel) widgetFrame.text:SetParent(widgetFrame.Panel) diff --git a/SVUI_Skins/components/addons/AdiBags.lua b/SVUI_Skins/components/addons/AdiBags.lua index 1608c54..3f52a5b 100644 --- a/SVUI_Skins/components/addons/AdiBags.lua +++ b/SVUI_Skins/components/addons/AdiBags.lua @@ -47,7 +47,7 @@ local function StyleAdiBags(event) if AdiBagsContainer1 then SkinFrame(AdiBagsContainer1) AdiBagsContainer1SearchBox:SetStyle("Editbox") - AdiBagsContainer1SearchBox:ModPoint('TOPRIGHT', AdiBagsSimpleLayeredRegion2, 'TOPRIGHT', -75, -1) + AdiBagsContainer1SearchBox:SetPoint('TOPRIGHT', AdiBagsSimpleLayeredRegion2, 'TOPRIGHT', -75, -1) end end, 1) elseif event == 'BANKFRAME_OPENED' then diff --git a/SVUI_Skins/components/addons/Altoholic.lua b/SVUI_Skins/components/addons/Altoholic.lua index 3570113..91d2cd1 100644 --- a/SVUI_Skins/components/addons/Altoholic.lua +++ b/SVUI_Skins/components/addons/Altoholic.lua @@ -62,11 +62,11 @@ local function StyleAltoholic(event, addon) SV.API:Set("Button", AltoholicFrame_ResetButton) SV.API:Set("Button", AltoholicFrame_SearchButton) - AltoholicFrameTab1:ModPoint("TOPLEFT", AltoholicFrame, "BOTTOMLEFT", -5, 2) - AltoholicFrame_ResetButton:ModPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 25, -77) - AltoholicFrame_SearchEditBox:ModPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 37, -56) - AltoholicFrame_ResetButton:ModSize(85, 24) - AltoholicFrame_SearchButton:ModSize(85, 24) + AltoholicFrameTab1:SetPoint("TOPLEFT", AltoholicFrame, "BOTTOMLEFT", -5, 2) + AltoholicFrame_ResetButton:SetPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 25, -77) + AltoholicFrame_SearchEditBox:SetPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 37, -56) + AltoholicFrame_ResetButton:SetSize(85, 24) + AltoholicFrame_SearchButton:SetSize(85, 24) end if addon == "Altoholic_Summary" then @@ -171,7 +171,7 @@ local function StyleAltoholic(event, addon) SV.API:Set("ScrollBar", AltoholicFrameAchievementsScrollFrameScrollBar) SV.API:Set("ScrollBar", AltoholicAchievementsMenuScrollFrameScrollBar) SV.API:Set("DropDown", AltoholicTabAchievements_SelectRealm) - AltoholicTabAchievements_SelectRealm:ModPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 205, -57) + AltoholicTabAchievements_SelectRealm:SetPoint("TOPLEFT", AltoholicFrame, "TOPLEFT", 205, -57) for i = 1, 15 do SV.API:Set("Button", _G["AltoholicTabAchievementsMenuItem"..i], true) @@ -260,9 +260,9 @@ local function StyleAltoholic(event, addon) SV.API:Set("DropDown", AltoholicTabSearch_SelectRarity) SV.API:Set("DropDown", AltoholicTabSearch_SelectSlot) SV.API:Set("DropDown", AltoholicTabSearch_SelectLocation) - AltoholicTabSearch_SelectRarity:ModSize(125, 32) - AltoholicTabSearch_SelectSlot:ModSize(125, 32) - AltoholicTabSearch_SelectLocation:ModSize(175, 32) + AltoholicTabSearch_SelectRarity:SetSize(125, 32) + AltoholicTabSearch_SelectSlot:SetSize(125, 32) + AltoholicTabSearch_SelectLocation:SetSize(175, 32) SV.API:Set("EditBox", _G["AltoholicTabSearch_MinLevel"]) SV.API:Set("EditBox", _G["AltoholicTabSearch_MaxLevel"]) diff --git a/SVUI_Skins/components/addons/AtlasLoot.lua b/SVUI_Skins/components/addons/AtlasLoot.lua index 58eb588..3232c3b 100644 --- a/SVUI_Skins/components/addons/AtlasLoot.lua +++ b/SVUI_Skins/components/addons/AtlasLoot.lua @@ -33,38 +33,38 @@ local SetTemplateDefault = {"AtlasLootCompareFrameSortButton_Name","AtlasLootCom local buttons = {"AtlasLoot_AtlasInfoFrame_ToggleALButton","AtlasLootPanelSearch_SearchButton","AtlasLootDefaultFrame_CompareFrame","AtlasLootPanelSearch_ClearButton","AtlasLootPanelSearch_LastResultButton","AtlasLoot10Man25ManSwitch","AtlasLootItemsFrame_BACK","AtlasLootCompareFrameSearch_ClearButton","AtlasLootCompareFrameSearch_SearchButton","AtlasLootCompareFrame_WishlistButton","AtlasLootCompareFrame_CloseButton2"} local function AL_OnShow(self, event, ...) - AtlasLootPanel:ModPoint("TOP", AtlasLootDefaultFrame, "BOTTOM", 0, -1) - AtlasLootQuickLooksButton:ModPoint("BOTTOM", AtlasLootItemsFrame, "BOTTOM", 53, 33) + AtlasLootPanel:SetPoint("TOP", AtlasLootDefaultFrame, "BOTTOM", 0, -1) + AtlasLootQuickLooksButton:SetPoint("BOTTOM", AtlasLootItemsFrame, "BOTTOM", 53, 33) AtlasLootPanelSearch_Box:ClearAllPoints() - AtlasLootPanelSearch_Box:ModPoint("TOP", AtlasLoot_PanelButton_7, "BOTTOM", 80, -10) - AtlasLootPanelSearch_SearchButton:ModPoint("LEFT", AtlasLootPanelSearch_Box, "RIGHT", 5, 0) - AtlasLootPanelSearch_SelectModuel:ModPoint("LEFT", AtlasLootPanelSearch_SearchButton, "RIGHT", 5, 0) - AtlasLootPanelSearch_ClearButton:ModPoint("LEFT", AtlasLootPanelSearch_SelectModuel, "RIGHT", 5, 0) - AtlasLootPanelSearch_LastResultButton:ModPoint("LEFT", AtlasLootPanelSearch_ClearButton, "RIGHT", 5, 0) - AtlasLoot10Man25ManSwitch:ModPoint("BOTTOM", AtlasLootItemsFrame, "BOTTOM", -130, 4) - if AtlasLoot_PanelButton_2 then AtlasLoot_PanelButton_2:ModPoint("LEFT", AtlasLoot_PanelButton_1, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_3 then AtlasLoot_PanelButton_3:ModPoint("LEFT", AtlasLoot_PanelButton_2, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_4 then AtlasLoot_PanelButton_4:ModPoint("LEFT", AtlasLoot_PanelButton_3, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_5 then AtlasLoot_PanelButton_5:ModPoint("LEFT", AtlasLoot_PanelButton_4, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_6 then AtlasLoot_PanelButton_6:ModPoint("LEFT", AtlasLoot_PanelButton_5, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_8 then AtlasLoot_PanelButton_8:ModPoint("LEFT", AtlasLoot_PanelButton_7, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_9 then AtlasLoot_PanelButton_9:ModPoint("LEFT", AtlasLoot_PanelButton_8, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_10 then AtlasLoot_PanelButton_10:ModPoint("LEFT", AtlasLoot_PanelButton_9, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_11 then AtlasLoot_PanelButton_11:ModPoint("LEFT", AtlasLoot_PanelButton_10, "RIGHT", 1, 0) end - if AtlasLoot_PanelButton_12 then AtlasLoot_PanelButton_12:ModPoint("LEFT", AtlasLoot_PanelButton_11, "RIGHT", 1, 0) end - AtlasLootCompareFrameSortButton_Rarity:ModPoint("LEFT", AtlasLootCompareFrameSortButton_Name, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_Rarity:ModWidth(80) - AtlasLootCompareFrameSortButton_Name:ModWidth(80) - AtlasLootCompareFrameSortButton_1:ModPoint("LEFT", AtlasLootCompareFrameSortButton_Rarity, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_2:ModPoint("LEFT", AtlasLootCompareFrameSortButton_1, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_3:ModPoint("LEFT", AtlasLootCompareFrameSortButton_2, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_4:ModPoint("LEFT", AtlasLootCompareFrameSortButton_3, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_5:ModPoint("LEFT", AtlasLootCompareFrameSortButton_4, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_6:ModPoint("LEFT", AtlasLootCompareFrameSortButton_5, "RIGHT", 1, 0) - AtlasLootCompareFrame_CloseButton2:ModPoint("BOTTOMRIGHT", AtlasLootCompareFrame, "BOTTOMRIGHT", -7, 10) - AtlasLootCompareFrame_WishlistButton:ModPoint("RIGHT", AtlasLootCompareFrame_CloseButton2, "LEFT", -1, 0) - AtlasLootCompareFrameSearch_SearchButton:ModPoint("LEFT", AtlasLootCompareFrameSearch_Box, "RIGHT", 5, 0) - AtlasLootCompareFrameSearch_SelectModuel:ModPoint("LEFT", AtlasLootCompareFrameSearch_SearchButton, "RIGHT", 5, 0) + AtlasLootPanelSearch_Box:SetPoint("TOP", AtlasLoot_PanelButton_7, "BOTTOM", 80, -10) + AtlasLootPanelSearch_SearchButton:SetPoint("LEFT", AtlasLootPanelSearch_Box, "RIGHT", 5, 0) + AtlasLootPanelSearch_SelectModuel:SetPoint("LEFT", AtlasLootPanelSearch_SearchButton, "RIGHT", 5, 0) + AtlasLootPanelSearch_ClearButton:SetPoint("LEFT", AtlasLootPanelSearch_SelectModuel, "RIGHT", 5, 0) + AtlasLootPanelSearch_LastResultButton:SetPoint("LEFT", AtlasLootPanelSearch_ClearButton, "RIGHT", 5, 0) + AtlasLoot10Man25ManSwitch:SetPoint("BOTTOM", AtlasLootItemsFrame, "BOTTOM", -130, 4) + if AtlasLoot_PanelButton_2 then AtlasLoot_PanelButton_2:SetPoint("LEFT", AtlasLoot_PanelButton_1, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_3 then AtlasLoot_PanelButton_3:SetPoint("LEFT", AtlasLoot_PanelButton_2, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_4 then AtlasLoot_PanelButton_4:SetPoint("LEFT", AtlasLoot_PanelButton_3, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_5 then AtlasLoot_PanelButton_5:SetPoint("LEFT", AtlasLoot_PanelButton_4, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_6 then AtlasLoot_PanelButton_6:SetPoint("LEFT", AtlasLoot_PanelButton_5, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_8 then AtlasLoot_PanelButton_8:SetPoint("LEFT", AtlasLoot_PanelButton_7, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_9 then AtlasLoot_PanelButton_9:SetPoint("LEFT", AtlasLoot_PanelButton_8, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_10 then AtlasLoot_PanelButton_10:SetPoint("LEFT", AtlasLoot_PanelButton_9, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_11 then AtlasLoot_PanelButton_11:SetPoint("LEFT", AtlasLoot_PanelButton_10, "RIGHT", 1, 0) end + if AtlasLoot_PanelButton_12 then AtlasLoot_PanelButton_12:SetPoint("LEFT", AtlasLoot_PanelButton_11, "RIGHT", 1, 0) end + AtlasLootCompareFrameSortButton_Rarity:SetPoint("LEFT", AtlasLootCompareFrameSortButton_Name, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_Rarity:SetWidth(80) + AtlasLootCompareFrameSortButton_Name:SetWidth(80) + AtlasLootCompareFrameSortButton_1:SetPoint("LEFT", AtlasLootCompareFrameSortButton_Rarity, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_2:SetPoint("LEFT", AtlasLootCompareFrameSortButton_1, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_3:SetPoint("LEFT", AtlasLootCompareFrameSortButton_2, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_4:SetPoint("LEFT", AtlasLootCompareFrameSortButton_3, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_5:SetPoint("LEFT", AtlasLootCompareFrameSortButton_4, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_6:SetPoint("LEFT", AtlasLootCompareFrameSortButton_5, "RIGHT", 1, 0) + AtlasLootCompareFrame_CloseButton2:SetPoint("BOTTOMRIGHT", AtlasLootCompareFrame, "BOTTOMRIGHT", -7, 10) + AtlasLootCompareFrame_WishlistButton:SetPoint("RIGHT", AtlasLootCompareFrame_CloseButton2, "LEFT", -1, 0) + AtlasLootCompareFrameSearch_SearchButton:SetPoint("LEFT", AtlasLootCompareFrameSearch_Box, "RIGHT", 5, 0) + AtlasLootCompareFrameSearch_SelectModuel:SetPoint("LEFT", AtlasLootCompareFrameSearch_SearchButton, "RIGHT", 5, 0) AtlasLootDefaultFrame_CloseButton:ClearAllPoints() AtlasLootDefaultFrame_CloseButton:SetPoint("TOPRIGHT", AtlasLootDefaultFrame, "TOPRIGHT", -5 -2) AtlasLootDefaultFrame:SetFrameLevel(0) @@ -90,9 +90,9 @@ local function Nine_IsThere(self, elapsed) end for i = 1, 9 do local f = _G["AtlasLootCompareFrameSortButton_"..i]f:SetWidth(44.44)end for _, object in pairs(nineisthere) do SV.API:Set("Frame", _G[object]) end - AtlasLootCompareFrameSortButton_7:ModPoint("LEFT", AtlasLootCompareFrameSortButton_6, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_8:ModPoint("LEFT", AtlasLootCompareFrameSortButton_7, "RIGHT", 1, 0) - AtlasLootCompareFrameSortButton_9:ModPoint("LEFT", AtlasLootCompareFrameSortButton_8, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_7:SetPoint("LEFT", AtlasLootCompareFrameSortButton_6, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_8:SetPoint("LEFT", AtlasLootCompareFrameSortButton_7, "RIGHT", 1, 0) + AtlasLootCompareFrameSortButton_9:SetPoint("LEFT", AtlasLootCompareFrameSortButton_8, "RIGHT", 1, 0) end local function Compare_OnShow(self, event, ...) diff --git a/SVUI_Skins/components/addons/AuctionLite.lua b/SVUI_Skins/components/addons/AuctionLite.lua index 53e64e2..a30303f 100644 --- a/SVUI_Skins/components/addons/AuctionLite.lua +++ b/SVUI_Skins/components/addons/AuctionLite.lua @@ -30,8 +30,8 @@ AUCTIONLITE local function BGHelper(parent) parent.bg = CreateFrame("Frame", nil, parent) parent.bg:SetStyle("!_Frame", "Inset") - parent.bg:ModPoint("TOPLEFT", parent, "TOPLEFT", 16, -103) - parent.bg:ModPoint("BOTTOMRIGHT", AuctionFrame, "BOTTOMRIGHT", -8, 36) + parent.bg:SetPoint("TOPLEFT", parent, "TOPLEFT", 16, -103) + parent.bg:SetPoint("BOTTOMRIGHT", AuctionFrame, "BOTTOMRIGHT", -8, 36) parent.bg:SetFrameLevel(parent.bg:GetFrameLevel() - 1) end diff --git a/SVUI_Skins/components/addons/BigWigs.lua b/SVUI_Skins/components/addons/BigWigs.lua index 39e319b..f5bd218 100644 --- a/SVUI_Skins/components/addons/BigWigs.lua +++ b/SVUI_Skins/components/addons/BigWigs.lua @@ -62,7 +62,7 @@ end local function applystyle(bar) if not FreeBG then FreeBG = {} end - bar:ModHeight(20) + bar:SetHeight(20) local bg = nil if #FreeBG > 0 then bg = tremove(FreeBG) @@ -96,8 +96,8 @@ local function applystyle(bar) bar.candyBarLabel:ClearAllPoints() bar.candyBarDuration:SetJustifyH("RIGHT") bar.candyBarDuration:ClearAllPoints() - bar.candyBarLabel:ModPoint("LEFT", bar, "LEFT", 4, 0) - bar.candyBarDuration:ModPoint("RIGHT", bar, "RIGHT", -4, 0) + bar.candyBarLabel:SetPoint("LEFT", bar, "LEFT", 4, 0) + bar.candyBarDuration:SetPoint("RIGHT", bar, "RIGHT", -4, 0) bar.candyBarBar:ClearAllPoints() bar.candyBarBar:SetAllPoints(bar) bar.candyBarBar.OldSetPoint = bar.candyBarBar.SetPoint @@ -105,7 +105,7 @@ local function applystyle(bar) bar.candyBarIconFrame.OldSetWidth = bar.candyBarIconFrame.SetWidth bar.candyBarIconFrame.SetWidth = SV.fubar bar.candyBarIconFrame:ClearAllPoints() - bar.candyBarIconFrame:ModPoint("BOTTOMRIGHT", bar, "BOTTOMLEFT", -1, 0) + bar.candyBarIconFrame:SetPoint("BOTTOMRIGHT", bar, "BOTTOMLEFT", -1, 0) bar.candyBarIconFrame:SetSize(20, 20) bar.candyBarIconFrame:SetTexCoord(0.1,0.9,0.1,0.9) end diff --git a/SVUI_Skins/components/addons/Outfitter.lua b/SVUI_Skins/components/addons/Outfitter.lua index 94d4512..ea870ab 100644 --- a/SVUI_Skins/components/addons/Outfitter.lua +++ b/SVUI_Skins/components/addons/Outfitter.lua @@ -33,16 +33,16 @@ local function StyleOutfitter() CharacterFrame:HookScript("OnShow", function(self) PaperDollSidebarTabs:SetPoint("BOTTOMRIGHT", CharacterFrameInsetRight, "TOPRIGHT", -14, 0) end) OutfitterFrame:HookScript("OnShow", function(self) SV.API:Set("Frame", OutfitterFrame) - OutfitterFrameTab1:ModSize(60, 25) - OutfitterFrameTab2:ModSize(60, 25) - OutfitterFrameTab3:ModSize(60, 25) + OutfitterFrameTab1:SetSize(60, 25) + OutfitterFrameTab2:SetSize(60, 25) + OutfitterFrameTab3:SetSize(60, 25) OutfitterMainFrame:RemoveTextures(true) for i = 0, 13 do if _G["OutfitterItem"..i.."OutfitSelected"] then _G["OutfitterItem"..i.."OutfitSelected"]:SetStyle("Button") _G["OutfitterItem"..i.."OutfitSelected"]:ClearAllPoints() - _G["OutfitterItem"..i.."OutfitSelected"]:ModSize(16) - _G["OutfitterItem"..i.."OutfitSelected"]:ModPoint("LEFT", _G["OutfitterItem"..i.."Outfit"], "LEFT", 8, 0) + _G["OutfitterItem"..i.."OutfitSelected"]:SetSize(16) + _G["OutfitterItem"..i.."OutfitSelected"]:SetPoint("LEFT", _G["OutfitterItem"..i.."Outfit"], "LEFT", 8, 0) end end end) @@ -50,9 +50,9 @@ local function StyleOutfitter() OutfitterFrameTab1:ClearAllPoints() OutfitterFrameTab2:ClearAllPoints() OutfitterFrameTab3:ClearAllPoints() - OutfitterFrameTab1:ModPoint("TOPLEFT", OutfitterFrame, "BOTTOMRIGHT", -65, -2) - OutfitterFrameTab2:ModPoint("LEFT", OutfitterFrameTab1, "LEFT", -65, 0) - OutfitterFrameTab3:ModPoint("LEFT", OutfitterFrameTab2, "LEFT", -65, 0) + OutfitterFrameTab1:SetPoint("TOPLEFT", OutfitterFrame, "BOTTOMRIGHT", -65, -2) + OutfitterFrameTab2:SetPoint("LEFT", OutfitterFrameTab1, "LEFT", -65, 0) + OutfitterFrameTab3:SetPoint("LEFT", OutfitterFrameTab2, "LEFT", -65, 0) OutfitterFrameTab1:SetStyle("Button") OutfitterFrameTab2:SetStyle("Button") OutfitterFrameTab3:SetStyle("Button") @@ -89,13 +89,13 @@ local function StyleOutfitter() OutfitterShowMinimapButton:SetStyle("Button") OutfitterShowOutfitBar:SetStyle("Button") OutfitterAutoSwitch:SetStyle("Button") - OutfitterItemComparisons:ModSize(20) - OutfitterTooltipInfo:ModSize(20) - OutfitterShowHotkeyMessages:ModSize(20) - OutfitterShowMinimapButton:ModSize(20) - OutfitterShowOutfitBar:ModSize(20) - OutfitterAutoSwitch:ModSize(20) - OutfitterShowOutfitBar:ModPoint("TOPLEFT", OutfitterAutoSwitch, "BOTTOMLEFT", 0, -5) + OutfitterItemComparisons:SetSize(20) + OutfitterTooltipInfo:SetSize(20) + OutfitterShowHotkeyMessages:SetSize(20) + OutfitterShowMinimapButton:SetSize(20) + OutfitterShowOutfitBar:SetSize(20) + OutfitterAutoSwitch:SetSize(20) + OutfitterShowOutfitBar:SetPoint("TOPLEFT", OutfitterAutoSwitch, "BOTTOMLEFT", 0, -5) OutfitterEditScriptDialogDoneButton:SetStyle("Button") OutfitterEditScriptDialogCancelButton:SetStyle("Button") SV.API:Set("ScrollFrame", OutfitterEditScriptDialogSourceScriptScrollBar) diff --git a/SVUI_Skins/components/addons/Postal.lua b/SVUI_Skins/components/addons/Postal.lua index 0f9ef0a..34b6e2a 100644 --- a/SVUI_Skins/components/addons/Postal.lua +++ b/SVUI_Skins/components/addons/Postal.lua @@ -30,8 +30,8 @@ POSTAL local function StylePostal() assert(PostalOpenAllButton, "AddOn Not Loaded") - InboxPrevPageButton:ModPoint("CENTER", InboxFrame, "BOTTOMLEFT", 45, 112) - InboxNextPageButton:ModPoint("CENTER", InboxFrame, "BOTTOMLEFT", 295, 112) + InboxPrevPageButton:SetPoint("CENTER", InboxFrame, "BOTTOMLEFT", 45, 112) + InboxNextPageButton:SetPoint("CENTER", InboxFrame, "BOTTOMLEFT", 295, 112) for i = 1, INBOXITEMS_TO_DISPLAY do local b = _G["MailItem"..i.."ExpireTime"] @@ -47,7 +47,7 @@ local function StylePostal() if PostalSelectOpenButton and not PostalSelectOpenButton.handled then PostalSelectOpenButton:SetStyle("Button") PostalSelectOpenButton.handled = true - PostalSelectOpenButton:ModPoint("RIGHT", InboxFrame, "TOP", -41, -48) + PostalSelectOpenButton:SetPoint("RIGHT", InboxFrame, "TOP", -41, -48) end if Postal_OpenAllMenuButton and not Postal_OpenAllMenuButton.handled then SV.API:Set("PageButton", Postal_OpenAllMenuButton, true) @@ -57,12 +57,12 @@ local function StylePostal() if PostalOpenAllButton and not PostalOpenAllButton.handled then PostalOpenAllButton:SetStyle("Button") PostalOpenAllButton.handled = true - PostalOpenAllButton:ModPoint("CENTER", InboxFrame, "TOP", -34, -400) + PostalOpenAllButton:SetPoint("CENTER", InboxFrame, "TOP", -34, -400) end if PostalSelectReturnButton and not PostalSelectReturnButton.handled then PostalSelectReturnButton:SetStyle("Button") PostalSelectReturnButton.handled = true - PostalSelectReturnButton:ModPoint("LEFT", InboxFrame, "TOP", -5, -48) + PostalSelectReturnButton:SetPoint("LEFT", InboxFrame, "TOP", -5, -48) end if Postal_PackageMenuButton and not Postal_PackageMenuButton.handled then SV.API:Set("PageButton", Postal_PackageMenuButton, true) diff --git a/SVUI_Skins/components/addons/Recount.lua b/SVUI_Skins/components/addons/Recount.lua index ec9a747..9576d2d 100644 --- a/SVUI_Skins/components/addons/Recount.lua +++ b/SVUI_Skins/components/addons/Recount.lua @@ -110,7 +110,7 @@ local function StyleRecount() SV.API:Set("Frame", Recount_ReportWindow.Whisper) Recount_ReportWindow.ReportButton:SetStyle("Button") SV.API:Set("ScrollBar", Recount_ReportWindow_Slider) - Recount_ReportWindow_Slider:GetThumbTexture():ModSize(6,6) + Recount_ReportWindow_Slider:GetThumbTexture():SetSize(6,6) end) end MOD:SaveAddonStyle("Recount", StyleRecount) \ No newline at end of file diff --git a/SVUI_Skins/components/addons/SVUI_!Options.lua b/SVUI_Skins/components/addons/SVUI_!Options.lua index 6d9f7b8..4ac81fd 100644 --- a/SVUI_Skins/components/addons/SVUI_!Options.lua +++ b/SVUI_Skins/components/addons/SVUI_!Options.lua @@ -133,7 +133,7 @@ function MOD:StyleSVUIOptions() widgetDropdown:RemoveTextures() widgetButton:ClearAllPoints() - widgetButton:ModPoint("RIGHT", widgetDropdown, "RIGHT", -20, 0) + widgetButton:SetPoint("RIGHT", widgetDropdown, "RIGHT", -20, 0) widgetButton:SetFrameLevel(widgetButton:GetFrameLevel() + 1) Widget_PaginationStyle(widgetButton, true) @@ -158,11 +158,11 @@ function MOD:StyleSVUIOptions() SV.API:Set("!_Frame", widgetSlider, "Bar") - widgetSlider:ModHeight(20) + widgetSlider:SetHeight(20) widgetSlider:SetThumbTexture("Interface\\Buttons\\UI-ScrollBar-Knob") widgetSlider:GetThumbTexture():SetVertexColor(0.8, 0.8, 0.8) - widgetEditbox:ModHeight(15) + widgetEditbox:SetHeight(15) widgetEditbox:SetPoint("TOP", widgetSlider, "BOTTOM", 0, -1) widget.lowtext:SetPoint("TOPLEFT", widgetSlider, "BOTTOMLEFT", 2, -2) @@ -175,15 +175,15 @@ function MOD:StyleSVUIOptions() widgetFrame:RemoveTextures() Widget_PaginationStyle(dropButton, true) widgetFrame.text:ClearAllPoints() - widgetFrame.text:ModPoint("RIGHT", dropButton, "LEFT", -2, 0) + widgetFrame.text:SetPoint("RIGHT", dropButton, "LEFT", -2, 0) dropButton:ClearAllPoints() - dropButton:ModPoint("RIGHT", widgetFrame, "RIGHT", -10, -6) + dropButton:SetPoint("RIGHT", widgetFrame, "RIGHT", -10, -6) if(not widgetFrame.Panel) then if(widgetType == "LSM30_Sound") then SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) widget.soundbutton:SetParent(widgetFrame.Panel) widget.soundbutton:ClearAllPoints() - widget.soundbutton:ModPoint("LEFT", widgetFrame.Panel, "LEFT", 2, 0) + widget.soundbutton:SetPoint("LEFT", widgetFrame.Panel, "LEFT", 2, 0) elseif(widgetType == "LSM30_Statusbar") then SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) widget.bar:SetParent(widgetFrame.Panel) @@ -193,7 +193,7 @@ function MOD:StyleSVUIOptions() else SetAdjustedStyle(widgetFrame, 20, -17, 2, -2) end - widgetFrame.Panel:ModPoint("BOTTOMRIGHT", dropButton, "BOTTOMRIGHT", 2, -2) + widgetFrame.Panel:SetPoint("BOTTOMRIGHT", dropButton, "BOTTOMRIGHT", 2, -2) end dropButton:SetParent(widgetFrame.Panel) widgetFrame.text:SetParent(widgetFrame.Panel) diff --git a/SVUI_Skins/components/addons/TradeSkillDW.lua b/SVUI_Skins/components/addons/TradeSkillDW.lua index 4a58ec1..9e28997 100644 --- a/SVUI_Skins/components/addons/TradeSkillDW.lua +++ b/SVUI_Skins/components/addons/TradeSkillDW.lua @@ -39,7 +39,7 @@ local function StyleTradeSkillDW() TradeSkillListScrollFrame:RemoveTextures(true) SV.API:Set("Frame", TradeSkillGuildFrame,"Transparent") SV.API:Set("Frame", TradeSkillGuildFrameContainer,"Transparent") - TradeSkillGuildFrame:ModPoint("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) + TradeSkillGuildFrame:SetPoint("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) SV.API:Set("CloseButton", TradeSkillGuildFrameCloseButton) TradeSkillFrame:HookScript("OnShow", function() @@ -52,7 +52,7 @@ local function StyleTradeSkillDW() end end) - TradeSkillFrame:ModHeight(TradeSkillFrame:GetHeight() + 12) + TradeSkillFrame:SetHeight(TradeSkillFrame:GetHeight() + 12) TradeSkillRankFrame:SetStyle("Frame", 'Transparent') TradeSkillRankFrame:SetStatusBarTexture(SV.media.statusbar.default) TradeSkillCreateButton:SetStyle("Button") @@ -64,11 +64,11 @@ local function StyleTradeSkillDW() TradeSkillLinkButton:GetPushedTexture():SetTexCoord(0.25, 0.7, 0.45, 0.8) TradeSkillLinkButton:GetHighlightTexture():Die() SV.API:Set("Frame", TradeSkillLinkButton,"Transparent") - TradeSkillLinkButton:ModSize(17, 14) - TradeSkillLinkButton:ModPoint("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) + TradeSkillLinkButton:SetSize(17, 14) + TradeSkillLinkButton:SetPoint("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) TradeSkillFrameSearchBox:SetStyle("Editbox") TradeSkillInputBox:SetStyle("Editbox") - TradeSkillIncrementButton:ModPoint("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) + TradeSkillIncrementButton:SetPoint("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) SV.API:Set("CloseButton", TradeSkillFrameCloseButton) SV.API:Set("ScrollFrame", TradeSkillDetailScrollFrameScrollBar) @@ -80,8 +80,8 @@ local function StyleTradeSkillDW() if TradeSkillSkillIcon:GetNormalTexture() then TradeSkillSkillIcon:GetNormalTexture():SetTexCoord(0.1,0.9,0.1,0.9) TradeSkillSkillIcon:GetNormalTexture():ClearAllPoints() - TradeSkillSkillIcon:GetNormalTexture():ModPoint("TOPLEFT", 2, -2) - TradeSkillSkillIcon:GetNormalTexture():ModPoint("BOTTOMRIGHT", -2, 2) + TradeSkillSkillIcon:GetNormalTexture():SetPoint("TOPLEFT", 2, -2) + TradeSkillSkillIcon:GetNormalTexture():SetPoint("BOTTOMRIGHT", -2, 2) end for i = 1, MAX_TRADE_SKILL_REAGENTS do @@ -94,8 +94,8 @@ local function StyleTradeSkillDW() icon.backdrop = CreateFrame("Frame", nil, button) icon.backdrop:SetFrameLevel(button:GetFrameLevel() - 1) SV.API:Set("Frame", icon.backdrop,"Transparent") - icon.backdrop:ModPoint("TOPLEFT", icon, "TOPLEFT", -2, 2) - icon.backdrop:ModPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 2, -2) + icon.backdrop:SetPoint("TOPLEFT", icon, "TOPLEFT", -2, 2) + icon.backdrop:SetPoint("BOTTOMRIGHT", icon, "BOTTOMRIGHT", 2, -2) end icon:SetParent(icon.backdrop) count:SetParent(icon.backdrop) @@ -103,7 +103,7 @@ local function StyleTradeSkillDW() if i > 2 and once == false then local point, anchoredto, point2, x, y = button:GetPoint() button:ClearAllPoints() - button:ModPoint(point, anchoredto, point2, x, y - 3) + button:SetPoint(point, anchoredto, point2, x, y - 3) once = true end _G["TradeSkillReagent"..i.."NameFrame"]:Die() diff --git a/SVUI_Skins/components/addons/VEM.lua b/SVUI_Skins/components/addons/VEM.lua index 7012041..48d611c 100644 --- a/SVUI_Skins/components/addons/VEM.lua +++ b/SVUI_Skins/components/addons/VEM.lua @@ -47,15 +47,15 @@ local function StyleBars(self) icon1.overlay = CreateFrame('Frame', '$parentIcon1Overlay', tbar) icon1.overlay:SetStyle("!_Frame") icon1.overlay:SetFrameLevel(0) - icon1.overlay:ModSize(22) - icon1.overlay:ModPoint('BOTTOMRIGHT', frame, 'BOTTOMLEFT', -2, 0) + icon1.overlay:SetSize(22) + icon1.overlay:SetPoint('BOTTOMRIGHT', frame, 'BOTTOMLEFT', -2, 0) end if not icon2.overlay then icon2.overlay = CreateFrame('Frame', '$parentIcon2Overlay', tbar) icon2.overlay:SetStyle("!_Frame") icon2.overlay:SetFrameLevel(0) - icon2.overlay:ModSize(22) - icon2.overlay:ModPoint('BOTTOMLEFT', frame, 'BOTTOMRIGHT', 2, 0) + icon2.overlay:SetSize(22) + icon2.overlay:SetPoint('BOTTOMLEFT', frame, 'BOTTOMRIGHT', 2, 0) end if bar.color then @@ -100,8 +100,8 @@ local function StyleBars(self) timer:SetShadowColor(0, 0, 0, 0) frame:SetHeight(22) - name:ModPoint('LEFT', frame, 'LEFT', 4, 0) - timer:ModPoint('RIGHT', frame, 'RIGHT', -4, 0) + name:SetPoint('LEFT', frame, 'LEFT', 4, 0) + timer:SetPoint('RIGHT', frame, 'RIGHT', -4, 0) name:SetFont(SV.media.font.dialog, 12, 'OUTLINE') timer:SetFont(SV.media.font.dialog, 12, 'OUTLINE') @@ -152,15 +152,15 @@ local StyleBoss = function() bar:ClearAllPoints() if count == 1 then if VEM_SavedOptions.HealthFrameGrowUp then - bar:ModPoint('BOTTOM', anch, 'TOP' , 0 , 12) + bar:SetPoint('BOTTOM', anch, 'TOP' , 0 , 12) else - bar:ModPoint('TOP', anch, 'BOTTOM' , 0, -22) + bar:SetPoint('TOP', anch, 'BOTTOM' , 0, -22) end else if VEM_SavedOptions.HealthFrameGrowUp then - bar:ModPoint('TOPLEFT', prev, 'TOPLEFT', 0, 26) + bar:SetPoint('TOPLEFT', prev, 'TOPLEFT', 0, 26) else - bar:ModPoint('TOPLEFT', prev, 'TOPLEFT', 0, -26) + bar:SetPoint('TOPLEFT', prev, 'TOPLEFT', 0, -26) end end bar:SetStyle("!_Frame", 'Transparent') @@ -176,8 +176,8 @@ local StyleBoss = function() timer:SetShadowColor(0, 0, 0, 0) bar:SetHeight(22) - name:ModPoint('LEFT', bar, 'LEFT', 4, 0) - timer:ModPoint('RIGHT', bar, 'RIGHT', -4, 0) + name:SetPoint('LEFT', bar, 'LEFT', 4, 0) + timer:SetPoint('RIGHT', bar, 'RIGHT', -4, 0) name:SetFont(SV.media.font.dialog, 12, 'OUTLINE') timer:SetFont(SV.media.font.dialog, 12, 'OUTLINE') diff --git a/SVUI_Skins/components/addons/Zygor.lua b/SVUI_Skins/components/addons/Zygor.lua index c3223c9..7d94a90 100644 --- a/SVUI_Skins/components/addons/Zygor.lua +++ b/SVUI_Skins/components/addons/Zygor.lua @@ -30,11 +30,11 @@ ZYGOR local function StyleZygorTabs() if(not ZGVCharacterGearFinderButton) then return end ZGVCharacterGearFinderButton.Highlight:SetTexture(1, 1, 1, 0.3) - ZGVCharacterGearFinderButton.Highlight:ModPoint("TOPLEFT", 3, -4) - ZGVCharacterGearFinderButton.Highlight:ModPoint("BOTTOMRIGHT", -1, 0) + ZGVCharacterGearFinderButton.Highlight:SetPoint("TOPLEFT", 3, -4) + ZGVCharacterGearFinderButton.Highlight:SetPoint("BOTTOMRIGHT", -1, 0) ZGVCharacterGearFinderButton.Hider:SetTexture(0.4, 0.4, 0.4, 0.4) - ZGVCharacterGearFinderButton.Hider:ModPoint("TOPLEFT", 3, -4) - ZGVCharacterGearFinderButton.Hider:ModPoint("BOTTOMRIGHT", -1, 0) + ZGVCharacterGearFinderButton.Hider:SetPoint("TOPLEFT", 3, -4) + ZGVCharacterGearFinderButton.Hider:SetPoint("BOTTOMRIGHT", -1, 0) ZGVCharacterGearFinderButton.TabBg:Die() if i == 1 then for x = 1, ZGVCharacterGearFinderButton:GetNumRegions()do @@ -43,8 +43,8 @@ local function StyleZygorTabs() end end ZGVCharacterGearFinderButton:SetStyle("Frame", "Default", true, 2) - ZGVCharacterGearFinderButton.Panel:ModPoint("TOPLEFT", 2, -3) - ZGVCharacterGearFinderButton.Panel:ModPoint("BOTTOMRIGHT", 0, -2) + ZGVCharacterGearFinderButton.Panel:SetPoint("TOPLEFT", 2, -3) + ZGVCharacterGearFinderButton.Panel:SetPoint("BOTTOMRIGHT", 0, -2) end local function StyleZygor() diff --git a/SVUI_Skins/components/blizzard/achievement.lua b/SVUI_Skins/components/blizzard/achievement.lua index de92a60..c32eb24 100644 --- a/SVUI_Skins/components/blizzard/achievement.lua +++ b/SVUI_Skins/components/blizzard/achievement.lua @@ -72,7 +72,7 @@ local _hook_TrackingPoint = function(self, anchor, parent, relative, x, y) local actual = self.ListParent if(anchor ~= "BOTTOMLEFT" or parent ~= actual or relative ~= "BOTTOMLEFT" or x ~= 5 or y ~= 5) then self:ClearAllPoints() - self:ModPoint("BOTTOMLEFT", actual, "BOTTOMLEFT", 5, 5) + self:SetPoint("BOTTOMLEFT", actual, "BOTTOMLEFT", 5, 5) end end @@ -101,10 +101,10 @@ local _hook_AchievementsUpdate = function() end if(icon and not icon.Panel) then icon:SetStyle("!_Frame", "Icon") - icon:ModHeight(icon:GetHeight() - 14) - icon:ModWidth(icon:GetWidth() - 14) + icon:SetHeight(icon:GetHeight() - 14) + icon:SetWidth(icon:GetWidth() - 14) icon:ClearAllPoints() - icon:ModPoint("LEFT", 6, 0) + icon:SetPoint("LEFT", 6, 0) end if summary.accountWide then @@ -168,16 +168,16 @@ local function AchievementStyle() AchievementFrameSummaryAchievements:RemoveTextures(true) AchievementFrameSummaryAchievements:SetStyle("Frame", 'Inset') AchievementFrameHeaderTitle:ClearAllPoints() - AchievementFrameHeaderTitle:ModPoint("TOPLEFT", AchievementFrame.Panel, "TOPLEFT", -30, -8) + AchievementFrameHeaderTitle:SetPoint("TOPLEFT", AchievementFrame.Panel, "TOPLEFT", -30, -8) AchievementFrameHeaderPoints:ClearAllPoints() - AchievementFrameHeaderPoints:ModPoint("LEFT", AchievementFrameHeaderTitle, "RIGHT", 2, 0) + AchievementFrameHeaderPoints:SetPoint("LEFT", AchievementFrameHeaderTitle, "RIGHT", 2, 0) AchievementFrameCategoriesContainer:SetStyle("Frame", "Inset", true, 2, -2, 2) AchievementFrameAchievementsContainer:SetStyle("Frame", "Default") - AchievementFrameAchievementsContainer.Panel:ModPoint("TOPLEFT", 0, 2) - AchievementFrameAchievementsContainer.Panel:ModPoint("BOTTOMRIGHT", -3, -3) + AchievementFrameAchievementsContainer.Panel:SetPoint("TOPLEFT", 0, 2) + AchievementFrameAchievementsContainer.Panel:SetPoint("BOTTOMRIGHT", -3, -3) SV.API:Set("CloseButton", AchievementFrameCloseButton, AchievementFrame.Panel) SV.API:Set("DropDown", AchievementFrameFilterDropDown) - AchievementFrameFilterDropDown:ModPoint("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) + AchievementFrameFilterDropDown:SetPoint("TOPRIGHT", AchievementFrame, "TOPRIGHT", -44, 5) SV.API:Set("ScrollFrame", AchievementFrameCategoriesContainerScrollBar, 5) SV.API:Set("ScrollFrame", AchievementFrameAchievementsContainerScrollBar, 5) @@ -199,7 +199,7 @@ local function AchievementStyle() AchievementFrameComparisonSummaryFriendStatusBar.text:ClearAllPoints() AchievementFrameComparisonSummaryFriendStatusBar.text:SetPoint("CENTER") - AchievementFrameComparisonHeader:ModPoint("BOTTOMRIGHT", AchievementFrameComparison, "TOPRIGHT", 45, -20) + AchievementFrameComparisonHeader:SetPoint("BOTTOMRIGHT", AchievementFrameComparison, "TOPRIGHT", 45, -20) for i = 1, 12 do local categoryName = ("AchievementFrameSummaryCategoriesCategory%d"):format(i) @@ -254,8 +254,8 @@ local function AchievementStyle() button.bg1 = button:CreateTexture(nil, "BACKGROUND", nil, 4) button.bg1:SetTexture(SV.media.background.button) button.bg1:SetVertexColor(unpack(SV.media.color.default)) - button.bg1:ModPoint("TOPLEFT", 1, -1) - button.bg1:ModPoint("BOTTOMRIGHT", -1, 1) + button.bg1:SetPoint("TOPLEFT", 1, -1) + button.bg1:SetPoint("BOTTOMRIGHT", -1, 1) button.bg3 = CreateFrame("Frame", nil, button) button.bg3:WrapPoints(3,3) @@ -283,15 +283,15 @@ local function AchievementStyle() end icon:SetStyle("!_Frame", "Default") - icon:ModHeight(icon:GetHeight()-14) - icon:ModWidth(icon:GetWidth()-14) + icon:SetHeight(icon:GetHeight()-14) + icon:SetWidth(icon:GetWidth()-14) icon:ClearAllPoints() - icon:ModPoint("LEFT", 6, 0) + icon:SetPoint("LEFT", 6, 0) end if(track) then track:ClearAllPoints() - track:ModPoint("BOTTOMLEFT", 1, 5) + track:SetPoint("BOTTOMLEFT", 1, 5) track:RemoveTextures() track:SetStyle("Checkbox") track.ListParent = button @@ -313,35 +313,35 @@ local function AchievementStyle() _G[d].bg1:SetDrawLayer("BACKGROUND", 4) _G[d].bg1:SetTexture(SV.BaseTexture) _G[d].bg1:SetVertexColor(unpack(SV.media.color.default)) - _G[d].bg1:ModPoint("TOPLEFT", 4, -4) - _G[d].bg1:ModPoint("BOTTOMRIGHT", -4, 4) + _G[d].bg1:SetPoint("TOPLEFT", 4, -4) + _G[d].bg1:SetPoint("BOTTOMRIGHT", -4, 4) _G[d].bg2 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg2:SetDrawLayer("BACKGROUND", 3) _G[d].bg2:SetTexture(0, 0, 0) - _G[d].bg2:ModPoint("TOPLEFT", 3, -3) - _G[d].bg2:ModPoint("BOTTOMRIGHT", -3, 3) + _G[d].bg2:SetPoint("TOPLEFT", 3, -3) + _G[d].bg2:SetPoint("BOTTOMRIGHT", -3, 3) _G[d].bg3 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg3:SetDrawLayer("BACKGROUND", 2) _G[d].bg3:SetTexture(0,0,0,1) - _G[d].bg3:ModPoint("TOPLEFT", 2, -2) - _G[d].bg3:ModPoint("BOTTOMRIGHT", -2, 2) + _G[d].bg3:SetPoint("TOPLEFT", 2, -2) + _G[d].bg3:SetPoint("BOTTOMRIGHT", -2, 2) _G[d].bg4 = _G[d]:CreateTexture(nil, "BACKGROUND") _G[d].bg4:SetDrawLayer("BACKGROUND", 1) _G[d].bg4:SetTexture(0, 0, 0) - _G[d].bg4:ModPoint("TOPLEFT", 1, -1) - _G[d].bg4:ModPoint("BOTTOMRIGHT", -1, 1) + _G[d].bg4:SetPoint("TOPLEFT", 1, -1) + _G[d].bg4:SetPoint("BOTTOMRIGHT", -1, 1) if v == "Friend"then - _G[d.."Shield"]:ModPoint("TOPRIGHT", _G["AchievementFrameComparisonContainerButton"..f.."Friend"], "TOPRIGHT", -20, -3) + _G[d.."Shield"]:SetPoint("TOPRIGHT", _G["AchievementFrameComparisonContainerButton"..f.."Friend"], "TOPRIGHT", -20, -3) end _G[d.."IconBling"]:Die() _G[d.."IconOverlay"]:Die() _G[d.."Icon"]:SetStyle("!_Frame", "Default") - _G[d.."Icon"]:ModHeight(_G[d.."Icon"]:GetHeight()-14) - _G[d.."Icon"]:ModWidth(_G[d.."Icon"]:GetWidth()-14) + _G[d.."Icon"]:SetHeight(_G[d.."Icon"]:GetHeight()-14) + _G[d.."Icon"]:SetWidth(_G[d.."Icon"]:GetWidth()-14) _G[d.."Icon"]:ClearAllPoints() - _G[d.."Icon"]:ModPoint("LEFT", 6, 0) + _G[d.."Icon"]:SetPoint("LEFT", 6, 0) _G[d.."IconTexture"]:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) _G[d.."IconTexture"]:InsetPoints() end @@ -391,7 +391,7 @@ local function AchievementStyle() d:SetStatusBarTexture(SV.media.statusbar.default) d:SetStatusBarColor(4/255, 179/255, 30/255) d:SetFrameLevel(d:GetFrameLevel()+3) - d:ModHeight(d:GetHeight()-2) + d:SetHeight(d:GetHeight()-2) d.bg1 = d:CreateTexture(nil, "BACKGROUND") d.bg1:SetDrawLayer("BACKGROUND", 4) d.bg1:SetTexture(SV.BaseTexture) @@ -400,14 +400,14 @@ local function AchievementStyle() d.bg3 = d:CreateTexture(nil, "BACKGROUND") d.bg3:SetDrawLayer("BACKGROUND", 2) d.bg3:SetTexture(0,0,0,1) - d.bg3:ModPoint("TOPLEFT", -1, 1) - d.bg3:ModPoint("BOTTOMRIGHT", 1, -1); + d.bg3:SetPoint("TOPLEFT", -1, 1) + d.bg3:SetPoint("BOTTOMRIGHT", 1, -1); d.text:ClearAllPoints() d.text:SetPoint("CENTER", d, "CENTER", 0, -1) d.text:SetJustifyH("CENTER") if y>1 then d:ClearAllPoints() - d:ModPoint("TOP", _G["AchievementFrameProgressBar"..y-1], "BOTTOM", 0, -5) + d:SetPoint("TOP", _G["AchievementFrameProgressBar"..y-1], "BOTTOM", 0, -5) hooksecurefunc(d, "SetPoint", function(k, p, q, r, s, t, z) if not z then k:ClearAllPoints()k:SetPoint("TOP", _G["AchievementFrameProgressBar"..y-1], "BOTTOM", 0, -5, true) diff --git a/SVUI_Skins/components/blizzard/alert.lua b/SVUI_Skins/components/blizzard/alert.lua index bce7084..ad49ba7 100644 --- a/SVUI_Skins/components/blizzard/alert.lua +++ b/SVUI_Skins/components/blizzard/alert.lua @@ -307,8 +307,8 @@ local function AlertStyle() frame.copper:SetStyle("Editbox") frame.input:SetStyle("Editbox") - frame.input.Panel:ModPoint("TOPLEFT", -2, -4) - frame.input.Panel:ModPoint("BOTTOMRIGHT", 2, 4) + frame.input.Panel:SetPoint("TOPLEFT", -2, -4) + frame.input.Panel:SetPoint("BOTTOMRIGHT", 2, 4) end end diff --git a/SVUI_Skins/components/blizzard/auctionhouse.lua b/SVUI_Skins/components/blizzard/auctionhouse.lua index 26240f7..82f736b 100644 --- a/SVUI_Skins/components/blizzard/auctionhouse.lua +++ b/SVUI_Skins/components/blizzard/auctionhouse.lua @@ -120,8 +120,8 @@ local function AuctionStyle() AuctionProgressFrameCancelButton:SetHitRectInsets(0, 0, 0, 0) AuctionProgressFrameCancelButton:GetNormalTexture():InsetPoints() AuctionProgressFrameCancelButton:GetNormalTexture():SetTexCoord(0.67, 0.37, 0.61, 0.26) - AuctionProgressFrameCancelButton:ModSize(28, 28) - AuctionProgressFrameCancelButton:ModPoint("LEFT", AuctionProgressBar, "RIGHT", 8, 0) + AuctionProgressFrameCancelButton:SetSize(28, 28) + AuctionProgressFrameCancelButton:SetPoint("LEFT", AuctionProgressBar, "RIGHT", 8, 0) AuctionProgressBarIcon:SetTexCoord(0.67, 0.37, 0.61, 0.26) local AuctionProgressBarBG = CreateFrame("Frame", nil, AuctionProgressBarIcon:GetParent()) @@ -146,14 +146,14 @@ local function AuctionStyle() end end - AuctionsCloseButton:ModPoint("BOTTOMRIGHT", AuctionFrameAuctions, "BOTTOMRIGHT", 66, 10) - AuctionsCancelAuctionButton:ModPoint("RIGHT", AuctionsCloseButton, "LEFT", -4, 0) + AuctionsCloseButton:SetPoint("BOTTOMRIGHT", AuctionFrameAuctions, "BOTTOMRIGHT", 66, 10) + AuctionsCancelAuctionButton:SetPoint("RIGHT", AuctionsCloseButton, "LEFT", -4, 0) - BidBuyoutButton:ModPoint("RIGHT", BidCloseButton, "LEFT", -4, 0) - BidBidButton:ModPoint("RIGHT", BidBuyoutButton, "LEFT", -4, 0) + BidBuyoutButton:SetPoint("RIGHT", BidCloseButton, "LEFT", -4, 0) + BidBidButton:SetPoint("RIGHT", BidBuyoutButton, "LEFT", -4, 0) - BrowseBuyoutButton:ModPoint("RIGHT", BrowseCloseButton, "LEFT", -4, 0) - BrowseBidButton:ModPoint("RIGHT", BrowseBuyoutButton, "LEFT", -4, 0) + BrowseBuyoutButton:SetPoint("RIGHT", BrowseCloseButton, "LEFT", -4, 0) + BrowseBidButton:SetPoint("RIGHT", BrowseBuyoutButton, "LEFT", -4, 0) AuctionsItemButton:RemoveTextures() AuctionsItemButton:SetStyle("Button") @@ -175,22 +175,22 @@ local function AuctionStyle() SV.API:Set("Tab", _G["AuctionFrameTab3"]) AuctionFrameBrowse.bg1 = CreateFrame("Frame", nil, AuctionFrameBrowse) - AuctionFrameBrowse.bg1:ModPoint("TOPLEFT", 20, -103) - AuctionFrameBrowse.bg1:ModPoint("BOTTOMRIGHT", -575, 40) + AuctionFrameBrowse.bg1:SetPoint("TOPLEFT", 20, -103) + AuctionFrameBrowse.bg1:SetPoint("BOTTOMRIGHT", -575, 40) AuctionFrameBrowse.bg1:SetStyle("!_Frame", "Inset") BrowseNoResultsText:SetParent(AuctionFrameBrowse.bg1) BrowseSearchCountText:SetParent(AuctionFrameBrowse.bg1) - BrowseSearchButton:ModPoint("TOPRIGHT", AuctionFrameBrowse, "TOPRIGHT", 25, -34) - BrowseResetButton:ModPoint("TOPRIGHT", BrowseSearchButton, "TOPLEFT", -4, 0) + BrowseSearchButton:SetPoint("TOPRIGHT", AuctionFrameBrowse, "TOPRIGHT", 25, -34) + BrowseResetButton:SetPoint("TOPRIGHT", BrowseSearchButton, "TOPLEFT", -4, 0) AuctionFrameBrowse.bg1:SetFrameLevel(AuctionFrameBrowse.bg1:GetFrameLevel()-1) - BrowseFilterScrollFrame:ModHeight(300) + BrowseFilterScrollFrame:SetHeight(300) AuctionFrameBrowse.bg2 = CreateFrame("Frame", nil, AuctionFrameBrowse) AuctionFrameBrowse.bg2:SetStyle("!_Frame", "Inset") - AuctionFrameBrowse.bg2:ModPoint("TOPLEFT", AuctionFrameBrowse.bg1, "TOPRIGHT", 4, 0) - AuctionFrameBrowse.bg2:ModPoint("BOTTOMRIGHT", AuctionFrame, "BOTTOMRIGHT", -8, 40) + AuctionFrameBrowse.bg2:SetPoint("TOPLEFT", AuctionFrameBrowse.bg1, "TOPRIGHT", 4, 0) + AuctionFrameBrowse.bg2:SetPoint("BOTTOMRIGHT", AuctionFrame, "BOTTOMRIGHT", -8, 40) AuctionFrameBrowse.bg2:SetFrameLevel(AuctionFrameBrowse.bg2:GetFrameLevel() - 1) hooksecurefunc("FilterButton_SetType", _hook_FilterButton_SetType) @@ -202,9 +202,9 @@ local function AuctionStyle() end BrowseMinLevel:ClearAllPoints() - BrowseMinLevel:ModPoint("LEFT", BrowseName, "RIGHT", 8, 0) + BrowseMinLevel:SetPoint("LEFT", BrowseName, "RIGHT", 8, 0) BrowseMaxLevel:ClearAllPoints() - BrowseMaxLevel:ModPoint("LEFT", BrowseMinLevel, "RIGHT", 8, 0) + BrowseMaxLevel:SetPoint("LEFT", BrowseMinLevel, "RIGHT", 8, 0) AuctionsStackSizeEntry.Panel:SetAllPoints() AuctionsNumStacksEntry.Panel:SetAllPoints() @@ -232,7 +232,7 @@ local function AuctionStyle() local highLight = button:GetHighlightTexture() highLight:ClearAllPoints() - highLight:ModPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, -2) + highLight:SetPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, -2) highLight:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -2, 7) button:GetPushedTexture():SetAllPoints(highLight) _G["BrowseButton"..h.."Highlight"] = highLight @@ -265,7 +265,7 @@ local function AuctionStyle() local highLight = button:GetHighlightTexture() _G["AuctionsButton"..h.."Highlight"] = highLight highLight:ClearAllPoints() - highLight:ModPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, 0) + highLight:SetPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, 0) highLight:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -2, 5) button:GetPushedTexture():SetAllPoints(highLight) end @@ -297,30 +297,30 @@ local function AuctionStyle() local highLight = button:GetHighlightTexture() _G["BidButton"..h.."Highlight"] = highLight highLight:ClearAllPoints() - highLight:ModPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, 0) + highLight:SetPoint("TOPLEFT", buttonItem, "TOPRIGHT", 2, 0) highLight:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -2, 5) button:GetPushedTexture():SetAllPoints(highLight) end end end - BrowseScrollFrame:ModHeight(300) + BrowseScrollFrame:SetHeight(300) AuctionFrameBid.bg = CreateFrame("Frame", nil, AuctionFrameBid) AuctionFrameBid.bg:SetStyle("!_Frame", "Inset") - AuctionFrameBid.bg:ModPoint("TOPLEFT", 22, -72) - AuctionFrameBid.bg:ModPoint("BOTTOMRIGHT", 66, 39) + AuctionFrameBid.bg:SetPoint("TOPLEFT", 22, -72) + AuctionFrameBid.bg:SetPoint("BOTTOMRIGHT", 66, 39) AuctionFrameBid.bg:SetFrameLevel(AuctionFrameBid.bg:GetFrameLevel()-1) - BidScrollFrame:ModHeight(332) - AuctionsScrollFrame:ModHeight(336) + BidScrollFrame:SetHeight(332) + AuctionsScrollFrame:SetHeight(336) AuctionFrameAuctions.bg1 = CreateFrame("Frame", nil, AuctionFrameAuctions) AuctionFrameAuctions.bg1:SetStyle("!_Frame", "Inset") - AuctionFrameAuctions.bg1:ModPoint("TOPLEFT", 15, -70) - AuctionFrameAuctions.bg1:ModPoint("BOTTOMRIGHT", -545, 35) + AuctionFrameAuctions.bg1:SetPoint("TOPLEFT", 15, -70) + AuctionFrameAuctions.bg1:SetPoint("BOTTOMRIGHT", -545, 35) AuctionFrameAuctions.bg1:SetFrameLevel(AuctionFrameAuctions.bg1:GetFrameLevel() - 2) AuctionFrameAuctions.bg2 = CreateFrame("Frame", nil, AuctionFrameAuctions) AuctionFrameAuctions.bg2:SetStyle("!_Frame", "Inset") - AuctionFrameAuctions.bg2:ModPoint("TOPLEFT", AuctionFrameAuctions.bg1, "TOPRIGHT", 3, 0) - AuctionFrameAuctions.bg2:ModPoint("BOTTOMRIGHT", AuctionFrame, -8, 35) + AuctionFrameAuctions.bg2:SetPoint("TOPLEFT", AuctionFrameAuctions.bg1, "TOPRIGHT", 3, 0) + AuctionFrameAuctions.bg2:SetPoint("BOTTOMRIGHT", AuctionFrame, -8, 35) AuctionFrameAuctions.bg2:SetFrameLevel(AuctionFrameAuctions.bg2:GetFrameLevel() - 2) end --[[ diff --git a/SVUI_Skins/components/blizzard/barbershop.lua b/SVUI_Skins/components/blizzard/barbershop.lua index 71dc804..152f67b 100644 --- a/SVUI_Skins/components/blizzard/barbershop.lua +++ b/SVUI_Skins/components/blizzard/barbershop.lua @@ -22,7 +22,7 @@ local function BarberShopStyle() local buttons = {"BarberShopFrameOkayButton", "BarberShopFrameCancelButton", "BarberShopFrameResetButton"} - BarberShopFrameOkayButton:ModPoint("RIGHT", BarberShopFrameSelector4, "BOTTOM", 2, -50) + BarberShopFrameOkayButton:SetPoint("RIGHT", BarberShopFrameSelector4, "BOTTOM", 2, -50) for b = 1, #buttons do _G[buttons[b]]:RemoveTextures() @@ -31,7 +31,7 @@ local function BarberShopStyle() BarberShopFrame:RemoveTextures() BarberShopFrame:SetStyle("Frame", "Window") - BarberShopFrame:ModSize(BarberShopFrame:GetWidth()-30, BarberShopFrame:GetHeight()-56) + BarberShopFrame:SetSize(BarberShopFrame:GetWidth()-30, BarberShopFrame:GetHeight()-56) local lastframe; for i = 1, 5 do @@ -42,9 +42,9 @@ local function BarberShopStyle() selector:ClearAllPoints() if lastframe then - selector:ModPoint("TOP", lastframe, "BOTTOM", 0, -3) + selector:SetPoint("TOP", lastframe, "BOTTOM", 0, -3) else - selector:ModPoint("TOP", BarberShopFrame, "TOP", 0, -12) + selector:SetPoint("TOP", BarberShopFrame, "TOP", 0, -12) end selector:RemoveTextures() @@ -56,19 +56,19 @@ local function BarberShopStyle() BarberShopFrameMoneyFrame:RemoveTextures() BarberShopFrameMoneyFrame:SetStyle("Frame", "Inset") - BarberShopFrameMoneyFrame:ModPoint("TOP", lastframe, "BOTTOM", 0, -10) + BarberShopFrameMoneyFrame:SetPoint("TOP", lastframe, "BOTTOM", 0, -10) BarberShopFrameBackground:Die() BarberShopBannerFrameBGTexture:Die() BarberShopBannerFrame:Die() BarberShopAltFormFrameBorder:RemoveTextures() - BarberShopAltFormFrame:ModPoint("BOTTOM", BarberShopFrame, "TOP", 0, 5) + BarberShopAltFormFrame:SetPoint("BOTTOM", BarberShopFrame, "TOP", 0, 5) BarberShopAltFormFrame:RemoveTextures() BarberShopAltFormFrame:SetStyle("Frame", "Window2") BarberShopFrameResetButton:ClearAllPoints() - BarberShopFrameResetButton:ModPoint("BOTTOM", BarberShopFrame.Panel, "BOTTOM", 0, 4) + BarberShopFrameResetButton:SetPoint("BOTTOM", BarberShopFrame.Panel, "BOTTOM", 0, 4) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/battlefield.lua b/SVUI_Skins/components/blizzard/battlefield.lua index b2550d8..84f814d 100644 --- a/SVUI_Skins/components/blizzard/battlefield.lua +++ b/SVUI_Skins/components/blizzard/battlefield.lua @@ -27,7 +27,7 @@ local function BattlefieldStyle() BattlefieldMinimapTabMiddle:Die() BattlefieldMinimapTabRight:Die() BattlefieldMinimap:SetStyle("!_Frame", "Transparent") - BattlefieldMinimap.Panel:ModPoint("BOTTOMRIGHT", -4, 2) + BattlefieldMinimap.Panel:SetPoint("BOTTOMRIGHT", -4, 2) BattlefieldMinimap:SetFrameStrata("LOW") BattlefieldMinimapCloseButton:ClearAllPoints() BattlefieldMinimapCloseButton:SetPoint("TOPRIGHT", -4, 0) diff --git a/SVUI_Skins/components/blizzard/blackmarket.lua b/SVUI_Skins/components/blizzard/blackmarket.lua index 2650a4d..76cc544 100644 --- a/SVUI_Skins/components/blizzard/blackmarket.lua +++ b/SVUI_Skins/components/blizzard/blackmarket.lua @@ -71,8 +71,8 @@ local function BlackMarketStyle() BlackMarketFrame.MoneyFrameBorder:RemoveTextures() BlackMarketBidPriceGold:SetStyle("Editbox") - BlackMarketBidPriceGold.Panel:ModPoint("TOPLEFT", -2, 0) - BlackMarketBidPriceGold.Panel:ModPoint("BOTTOMRIGHT", -2, 0) + BlackMarketBidPriceGold.Panel:SetPoint("TOPLEFT", -2, 0) + BlackMarketBidPriceGold.Panel:SetPoint("BOTTOMRIGHT", -2, 0) BlackMarketFrame.BidButton:SetStyle("Button") hooksecurefunc("BlackMarketScrollFrame_Update", _hook_ScrollFrameUpdate) diff --git a/SVUI_Skins/components/blizzard/calendar.lua b/SVUI_Skins/components/blizzard/calendar.lua index 7cc611e..eee21bd 100644 --- a/SVUI_Skins/components/blizzard/calendar.lua +++ b/SVUI_Skins/components/blizzard/calendar.lua @@ -47,7 +47,7 @@ local function CalendarStyle() if(cfframe) then cfframe:RemoveTextures() - cfframe:ModWidth(155) + cfframe:SetWidth(155) cfframe:SetStyle("Frame", "Default") local cfbutton = _G["CalendarFilterButton"]; @@ -93,7 +93,7 @@ local function CalendarStyle() CalendarCreateEventMassInviteButton:SetStyle("Button") CalendarCreateEventInviteButton:SetStyle("Button") CalendarCreateEventInviteButton:SetPoint("TOPLEFT", CalendarCreateEventInviteEdit, "TOPRIGHT", 4, 1) - CalendarCreateEventInviteEdit:ModWidth(CalendarCreateEventInviteEdit:GetWidth()-2) + CalendarCreateEventInviteEdit:SetWidth(CalendarCreateEventInviteEdit:GetWidth()-2) CalendarCreateEventInviteList:RemoveTextures() CalendarCreateEventInviteList:SetStyle("!_Frame", "Default") CalendarCreateEventInviteEdit:SetStyle("Editbox") diff --git a/SVUI_Skins/components/blizzard/character.lua b/SVUI_Skins/components/blizzard/character.lua index f8bb06a..e7b3075 100644 --- a/SVUI_Skins/components/blizzard/character.lua +++ b/SVUI_Skins/components/blizzard/character.lua @@ -126,11 +126,11 @@ local function StyleCharacterSlots() if(tab) then if(not tab.Panel) then tab.Highlight:SetTexture(1, 1, 1, 0.3) - tab.Highlight:ModPoint("TOPLEFT", 3, -4) - tab.Highlight:ModPoint("BOTTOMRIGHT", -1, 0) + tab.Highlight:SetPoint("TOPLEFT", 3, -4) + tab.Highlight:SetPoint("BOTTOMRIGHT", -1, 0) tab.Hider:SetTexture(0.4, 0.4, 0.4, 0.4) - tab.Hider:ModPoint("TOPLEFT", 3, -4) - tab.Hider:ModPoint("BOTTOMRIGHT", -1, 0) + tab.Hider:SetPoint("TOPLEFT", 3, -4) + tab.Hider:SetPoint("BOTTOMRIGHT", -1, 0) tab.TabBg:Die() if i == 1 then for x = 1, tab:GetNumRegions()do @@ -139,8 +139,8 @@ local function StyleCharacterSlots() end end tab:SetStyle("Frame", "Default", true, 2) - tab.Panel:ModPoint("TOPLEFT", 2, -3) - tab.Panel:ModPoint("BOTTOMRIGHT", 0, -2) + tab.Panel:SetPoint("TOPLEFT", 2, -3) + tab.Panel:SetPoint("BOTTOMRIGHT", 0, -2) end if(i == 1) then tab:ClearAllPoints() @@ -210,7 +210,7 @@ local function PaperDollEquipmentManagerPane_OnShow() btn.BgTop:SetTexture("") btn.BgBottom:SetTexture("") btn.BgMiddle:SetTexture("") - btn.icon:ModSize(36, 36) + btn.icon:SetSize(36, 36) btn.Check:SetTexture("") btn.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) btn.icon:SetPoint("LEFT", btn, "LEFT", 4, 0) @@ -222,7 +222,7 @@ local function PaperDollEquipmentManagerPane_OnShow() GearManagerDialogPopup:RemoveTextures() GearManagerDialogPopup:SetStyle("Frame", "Inset", true) - GearManagerDialogPopup:ModPoint("LEFT", PaperDollFrame, "RIGHT", 4, 0) + GearManagerDialogPopup:SetPoint("LEFT", PaperDollFrame, "RIGHT", 4, 0) GearManagerDialogPopupScrollFrame:RemoveTextures() GearManagerDialogPopupEditBox:RemoveTextures() GearManagerDialogPopupEditBox:SetStyle("Frame", 'Inset') @@ -329,10 +329,10 @@ local function CharacterFrameStyle() PaperDollEquipmentManagerPane:SetStyle("Frame", 'Inset') PaperDollEquipmentManagerPaneEquipSet:SetStyle("Button") PaperDollEquipmentManagerPaneSaveSet:SetStyle("Button") - PaperDollEquipmentManagerPaneEquipSet:ModWidth(PaperDollEquipmentManagerPaneEquipSet:GetWidth()-8) - PaperDollEquipmentManagerPaneSaveSet:ModWidth(PaperDollEquipmentManagerPaneSaveSet:GetWidth()-8) - PaperDollEquipmentManagerPaneEquipSet:ModPoint("TOPLEFT", PaperDollEquipmentManagerPane, "TOPLEFT", 8, 0) - PaperDollEquipmentManagerPaneSaveSet:ModPoint("LEFT", PaperDollEquipmentManagerPaneEquipSet, "RIGHT", 4, 0) + PaperDollEquipmentManagerPaneEquipSet:SetWidth(PaperDollEquipmentManagerPaneEquipSet:GetWidth()-8) + PaperDollEquipmentManagerPaneSaveSet:SetWidth(PaperDollEquipmentManagerPaneSaveSet:GetWidth()-8) + PaperDollEquipmentManagerPaneEquipSet:SetPoint("TOPLEFT", PaperDollEquipmentManagerPane, "TOPLEFT", 8, 0) + PaperDollEquipmentManagerPaneSaveSet:SetPoint("LEFT", PaperDollEquipmentManagerPaneEquipSet, "RIGHT", 4, 0) PaperDollEquipmentManagerPaneEquipSet.ButtonBackground:SetTexture("") PaperDollEquipmentManagerPane:HookScript("OnShow", PaperDollEquipmentManagerPane_OnShow) @@ -347,7 +347,7 @@ local function CharacterFrameStyle() ReputationListScrollFrame:SetStyle("Frame", "Inset") ReputationDetailFrame:RemoveTextures() ReputationDetailFrame:SetStyle("Frame", "Inset", true) - ReputationDetailFrame:ModPoint("TOPLEFT", ReputationFrame, "TOPRIGHT", 4, -28) + ReputationDetailFrame:SetPoint("TOPLEFT", ReputationFrame, "TOPRIGHT", 4, -28) ReputationFrame:HookScript("OnShow", Reputation_OnShow) hooksecurefunc("ExpandFactionHeader", Reputation_OnShow) hooksecurefunc("CollapseFactionHeader", Reputation_OnShow) @@ -368,7 +368,7 @@ local function CharacterFrameStyle() end TokenFramePopup:RemoveTextures() TokenFramePopup:SetStyle("Frame", "Inset", true) - TokenFramePopup:ModPoint("TOPLEFT", TokenFrame, "TOPRIGHT", 4, -28) + TokenFramePopup:SetPoint("TOPLEFT", TokenFrame, "TOPRIGHT", 4, -28) end) PetModelFrame:SetStyle("Frame", "Premium", false, 1, -7, -7) @@ -376,7 +376,7 @@ local function CharacterFrameStyle() PetPaperDollPetInfo:SetFrameLevel(PetPaperDollPetInfo:GetFrameLevel() + 10) PetPaperDollPetInfo:SetStyle("Frame", "Icon") PetPaperDollPetInfo.Panel:SetFrameLevel(0) - PetPaperDollPetInfo:ModSize(24, 24) + PetPaperDollPetInfo:SetSize(24, 24) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/chat.lua b/SVUI_Skins/components/blizzard/chat.lua index 74db6dc..b475471 100644 --- a/SVUI_Skins/components/blizzard/chat.lua +++ b/SVUI_Skins/components/blizzard/chat.lua @@ -143,7 +143,7 @@ local ChatMenu_OnShow = function(self) self:SetStyle("Frame", "Window") end self:ClearAllPoints() - self:ModPoint("BOTTOMLEFT", ChatFrame1, "TOPLEFT", 0, 30) + self:SetPoint("BOTTOMLEFT", ChatFrame1, "TOPLEFT", 0, 30) end local ChatConfigChannelSettingsLeft_OnEvent = function(self) @@ -160,8 +160,8 @@ local ChatConfigChannelSettingsLeft_OnEvent = function(self) checkbox:SetStyle("Frame", 'Transparent') end checkbox:SetHeight(boxHeight) - checkbox.Panel:ModPoint("TOPLEFT",3,-1) - checkbox.Panel:ModPoint("BOTTOMRIGHT",-3,1) + checkbox.Panel:SetPoint("TOPLEFT",3,-1) + checkbox.Panel:SetPoint("BOTTOMRIGHT",-3,1) local check = _G[("%sCheck"):format(gName)] if(check) then @@ -190,8 +190,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) checkbox:SetHeight(boxHeight) check = _G[("%sCheck"):format(gName)] @@ -214,8 +214,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -231,8 +231,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -248,8 +248,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -265,8 +265,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -282,8 +282,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -299,8 +299,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) check = _G[("%sCheck"):format(gName)] if(check) then @@ -316,8 +316,8 @@ local ChatConfigBackgroundFrame_OnShow = function(self) checkbox:RemoveTextures() checkbox:SetStyle("Frame", "Default") end - checkbox.Panel:ModPoint("TOPLEFT", 3, -1) - checkbox.Panel:ModPoint("BOTTOMRIGHT", -3, 1) + checkbox.Panel:SetPoint("TOPLEFT", 3, -1) + checkbox.Panel:SetPoint("BOTTOMRIGHT", -3, 1) end end for i = 1, 4 do @@ -383,10 +383,10 @@ local function ChatStyle() end end - ChatConfigFrameOkayButton:ModPoint("RIGHT", ChatConfigFrameCancelButton, "RIGHT", -11, -1) - ChatConfigCombatSettingsFiltersDeleteButton:ModPoint("TOPRIGHT", ChatConfigCombatSettingsFilters, "BOTTOMRIGHT", 0, -1) - ChatConfigCombatSettingsFiltersAddFilterButton:ModPoint("RIGHT", ChatConfigCombatSettingsFiltersDeleteButton, "LEFT", -1, 0) - ChatConfigCombatSettingsFiltersCopyFilterButton:ModPoint("RIGHT", ChatConfigCombatSettingsFiltersAddFilterButton, "LEFT", -1, 0) + ChatConfigFrameOkayButton:SetPoint("RIGHT", ChatConfigFrameCancelButton, "RIGHT", -11, -1) + ChatConfigCombatSettingsFiltersDeleteButton:SetPoint("TOPRIGHT", ChatConfigCombatSettingsFilters, "BOTTOMRIGHT", 0, -1) + ChatConfigCombatSettingsFiltersAddFilterButton:SetPoint("RIGHT", ChatConfigCombatSettingsFiltersDeleteButton, "LEFT", -1, 0) + ChatConfigCombatSettingsFiltersCopyFilterButton:SetPoint("RIGHT", ChatConfigCombatSettingsFiltersAddFilterButton, "LEFT", -1, 0) if(_G["CombatConfigTab1"]) then _G["CombatConfigTab1"]:RemoveTextures() end if(_G["CombatConfigTab2"]) then _G["CombatConfigTab2"]:RemoveTextures() end @@ -410,9 +410,9 @@ local function ChatStyle() if(this) then this:ClearAllPoints() if this == CombatConfigColorsColorizeSpellNames then - this:ModPoint("TOP",CombatConfigColorsColorizeUnitName,"BOTTOM",0,-2) + this:SetPoint("TOP",CombatConfigColorsColorizeUnitName,"BOTTOM",0,-2) else - this:ModPoint("TOP",_G[ChatFrameList4[i-1]],"BOTTOM",0,-2) + this:SetPoint("TOP",_G[ChatFrameList4[i-1]],"BOTTOM",0,-2) end end end @@ -479,7 +479,7 @@ local function ChatStyle() CombatConfigSettingsNameEditBox:SetStyle("Editbox") - ChatConfigFrame:ModSize(680,596) + ChatConfigFrame:SetSize(680,596) ChatConfigFrameHeader:ClearAllPoints() ChatConfigFrameHeader:SetPoint("TOP", ChatConfigFrame, "TOP", 0, -5) diff --git a/SVUI_Skins/components/blizzard/dressup.lua b/SVUI_Skins/components/blizzard/dressup.lua index 49f70b6..bfc72ff 100644 --- a/SVUI_Skins/components/blizzard/dressup.lua +++ b/SVUI_Skins/components/blizzard/dressup.lua @@ -22,19 +22,19 @@ local function DressUpStyle() return end - DressUpFrame:ModSize(500, 600) + DressUpFrame:SetSize(500, 600) SV.API:Set("Window", DressUpFrame, true, true) DressUpModel:ClearAllPoints() - DressUpModel:ModPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) - DressUpModel:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) + DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) + DressUpModel:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) DressUpModel:SetStyle("!_Frame", "Model") - DressUpFrameCancelButton:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) + DressUpFrameCancelButton:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) DressUpFrameCancelButton:SetStyle("Button") - DressUpFrameResetButton:ModPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) + DressUpFrameResetButton:SetPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) DressUpFrameResetButton:SetStyle("Button") SV.API:Set("CloseButton", DressUpFrameCloseButton, DressUpFrame.Panel) diff --git a/SVUI_Skins/components/blizzard/encounterjournal.lua b/SVUI_Skins/components/blizzard/encounterjournal.lua index ae7956a..bf186e4 100644 --- a/SVUI_Skins/components/blizzard/encounterjournal.lua +++ b/SVUI_Skins/components/blizzard/encounterjournal.lua @@ -48,7 +48,7 @@ local function ChangeTabHelper(this, xOffset, yOffset) local initialAnchor, anchorParent, relativeAnchor, xPosition, yPosition = this:GetPoint() this:ClearAllPoints() - this:ModPoint(initialAnchor, anchorParent, relativeAnchor, xOffset or 0, yOffset or 0) + this:SetPoint(initialAnchor, anchorParent, relativeAnchor, xOffset or 0, yOffset or 0) end local function Outline(frame, noHighlight) @@ -57,8 +57,8 @@ local function Outline(frame, noHighlight) local mod = noHighlight and 50 or 5 local panel = CreateFrame('Frame', nil, frame) - panel:ModPoint('TOPLEFT', frame, 'TOPLEFT', 1, -1) - panel:ModPoint('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -1, 1) + panel:SetPoint('TOPLEFT', frame, 'TOPLEFT', 1, -1) + panel:SetPoint('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', -1, 1) --[[ UNDERLAY BORDER ]]-- local borderLeft = panel:CreateTexture(nil, "BORDER") diff --git a/SVUI_Skins/components/blizzard/friends.lua b/SVUI_Skins/components/blizzard/friends.lua index 3197b98..3a8dc85 100644 --- a/SVUI_Skins/components/blizzard/friends.lua +++ b/SVUI_Skins/components/blizzard/friends.lua @@ -94,8 +94,8 @@ local function TabCustomHelper(this) this.backdrop = CreateFrame("Frame", nil, this) this.backdrop:SetStyle("!_Frame", "Default") this.backdrop:SetFrameLevel(this:GetFrameLevel()-1) - this.backdrop:ModPoint("TOPLEFT", 3, -8) - this.backdrop:ModPoint("BOTTOMRIGHT", -6, 0) + this.backdrop:SetPoint("TOPLEFT", 3, -8) + this.backdrop:SetPoint("BOTTOMRIGHT", -6, 0) end local function ChannelList_OnUpdate() @@ -255,7 +255,7 @@ local function FriendsFrameStyle() FriendsTabHeaderSoRButtonIcon:SetDrawLayer('OVERLAY') FriendsTabHeaderSoRButtonIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) FriendsTabHeaderSoRButtonIcon:InsetPoints() - FriendsTabHeaderSoRButton:ModPoint('TOPRIGHT', FriendsTabHeader, 'TOPRIGHT', -8, -56) + FriendsTabHeaderSoRButton:SetPoint('TOPRIGHT', FriendsTabHeader, 'TOPRIGHT', -8, -56) FriendsTabHeaderRecruitAFriendButton:SetStyle("!_Frame", 'Default') FriendsTabHeaderRecruitAFriendButton:SetStyle("Button") FriendsTabHeaderRecruitAFriendButtonIcon:SetDrawLayer('OVERLAY') diff --git a/SVUI_Skins/components/blizzard/gossip.lua b/SVUI_Skins/components/blizzard/gossip.lua index 3991830..44b0f32 100644 --- a/SVUI_Skins/components/blizzard/gossip.lua +++ b/SVUI_Skins/components/blizzard/gossip.lua @@ -49,7 +49,7 @@ local function GossipStyle() GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") GossipGreetingScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) GossipGreetingScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - GossipGreetingScrollFrame.spellTex:ModSize(506, 615) + GossipGreetingScrollFrame.spellTex:SetSize(506, 615) GossipGreetingScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) _G["GossipFramePortrait"]:Die() _G["GossipFrameGreetingGoodbyeButton"]:RemoveTextures() @@ -63,7 +63,7 @@ local function GossipStyle() NPCFriendshipStatusBar:ClearAllPoints() NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 58, -34) - NPCFriendshipStatusBar.icon:ModSize(32,32) + NPCFriendshipStatusBar.icon:SetSize(32,32) NPCFriendshipStatusBar.icon:ClearAllPoints() NPCFriendshipStatusBar.icon:SetPoint("RIGHT", NPCFriendshipStatusBar, "LEFT", 0, -2) end diff --git a/SVUI_Skins/components/blizzard/guild.lua b/SVUI_Skins/components/blizzard/guild.lua index 5257a42..5552a5e 100644 --- a/SVUI_Skins/components/blizzard/guild.lua +++ b/SVUI_Skins/components/blizzard/guild.lua @@ -137,7 +137,7 @@ local function ChangeTabHelper(this) this:SetScript("OnLeave", Tab_OnLeave) local a,b,c,d,e = this:GetPoint() - this:ModPoint(a,b,c,1,e) + this:SetPoint(a,b,c,1,e) end local function StyleSortingButton(button) @@ -205,8 +205,8 @@ local _hook_RankOrder_OnUpdate = function() if not frame.nameBox.Panel then frame.nameBox:SetStyle("Editbox") end - frame.nameBox.Panel:ModPoint("TOPLEFT",-2,-4) - frame.nameBox.Panel:ModPoint("BOTTOMRIGHT",-4,4) + frame.nameBox.Panel:SetPoint("TOPLEFT",-2,-4) + frame.nameBox.Panel:SetPoint("BOTTOMRIGHT",-4,4) end end end @@ -358,8 +358,8 @@ local function GuildBankStyle() -- local BAGS = SV.Inventory -- if(BAGS) then -- local sortButton = CreateFrame("Button", nil, GuildBankFrame) - -- sortButton:ModPoint("BOTTOMLEFT", GuildBankFrame, "BOTTOMRIGHT", 2, 0) - -- sortButton:ModSize(36, 36) + -- sortButton:SetPoint("BOTTOMLEFT", GuildBankFrame, "BOTTOMRIGHT", 2, 0) + -- sortButton:SetSize(36, 36) -- sortButton:SetStyle("DockButton") -- sortButton:SetNormalTexture(BAGS.media.cleanupIcon) -- StyleSortingButton(sortButton) @@ -367,10 +367,10 @@ local function GuildBankStyle() -- sortButton:SetScript("OnClick", Sort_OnClick) -- end - GuildBankFrameWithdrawButton:ModPoint("RIGHT", GuildBankFrameDepositButton, "LEFT", -2, 0) - GuildBankInfoScrollFrame:ModPoint('TOPLEFT', GuildBankInfo, 'TOPLEFT', -10, 12) + GuildBankFrameWithdrawButton:SetPoint("RIGHT", GuildBankFrameDepositButton, "LEFT", -2, 0) + GuildBankInfoScrollFrame:SetPoint('TOPLEFT', GuildBankInfo, 'TOPLEFT', -10, 12) GuildBankInfoScrollFrame:RemoveTextures() - GuildBankInfoScrollFrame:ModWidth(GuildBankInfoScrollFrame:GetWidth()-8) + GuildBankInfoScrollFrame:SetWidth(GuildBankInfoScrollFrame:GetWidth()-8) GuildBankTransactionsScrollFrame:RemoveTextures() for i = 1, NUM_GUILDBANK_COLUMNS do @@ -431,7 +431,7 @@ local function GuildBankStyle() GuildBankPopupFrame:RemoveTextures() GuildBankPopupScrollFrame:RemoveTextures() GuildBankPopupFrame:SetStyle("!_Frame", "Transparent", true) - GuildBankPopupFrame:ModPoint("TOPLEFT", GuildBankFrame, "TOPRIGHT", 1, -30) + GuildBankPopupFrame:SetPoint("TOPLEFT", GuildBankFrame, "TOPRIGHT", 1, -30) GuildBankPopupOkayButton:SetStyle("Button") GuildBankPopupCancelButton:SetStyle("Button") GuildBankPopupEditBox:SetStyle("Editbox") @@ -440,8 +440,8 @@ local function GuildBankStyle() GuildBankPopupNameMiddle:Die() GuildItemSearchBox:RemoveTextures() GuildItemSearchBox:SetStyle("Frame", "Overlay") - GuildItemSearchBox.Panel:ModPoint("TOPLEFT", 10, -1) - GuildItemSearchBox.Panel:ModPoint("BOTTOMRIGHT", 4, 1) + GuildItemSearchBox.Panel:SetPoint("TOPLEFT", 10, -1) + GuildItemSearchBox.Panel:SetPoint("BOTTOMRIGHT", 4, 1) for i = 1, 16 do local btnName = ("GuildBankPopupButton%d"):format(i) @@ -500,14 +500,14 @@ local function GuildFrameStyle() if(tab) then SV.API:Set("Tab", tab) if i == 1 then - tab:ModPoint("TOPLEFT", GuildFrame, "BOTTOMLEFT", -10, 3) + tab:SetPoint("TOPLEFT", GuildFrame, "BOTTOMLEFT", -10, 3) end end end GuildNewsBossModel:SetStyle("Frame", 'Transparent') GuildNewsBossModelTextFrame:SetStyle("Frame", "Default") - GuildNewsBossModelTextFrame.Panel:ModPoint("TOPLEFT", GuildNewsBossModel.Panel, "BOTTOMLEFT", 0, -1) + GuildNewsBossModelTextFrame.Panel:SetPoint("TOPLEFT", GuildNewsBossModel.Panel, "BOTTOMLEFT", 0, -1) GuildNewsBossModel:SetPoint("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -43) GuildRecruitmentTankButton.checkButton:SetStyle("Checkbox") @@ -517,8 +517,8 @@ local function GuildFrameStyle() GuildFactionBar:RemoveTextures() GuildFactionBar.progress:SetTexture(SV.BaseTexture) GuildFactionBar:SetStyle("Frame", "Inset") - GuildFactionBar.Panel:ModPoint("TOPLEFT", GuildFactionBar.progress, "TOPLEFT", -1, 1) - GuildFactionBar.Panel:ModPoint("BOTTOMRIGHT", GuildFactionBar, "BOTTOMRIGHT", 1, 1) + GuildFactionBar.Panel:SetPoint("TOPLEFT", GuildFactionBar.progress, "TOPLEFT", -1, 1) + GuildFactionBar.Panel:SetPoint("BOTTOMRIGHT", GuildFactionBar, "BOTTOMRIGHT", 1, 1) GuildRosterContainer:SetStyle("Frame", "Inset") SV.API:Set("ScrollFrame", GuildRosterContainerScrollBar, 4, -4) @@ -571,7 +571,7 @@ local function GuildFrameStyle() end end - GuildNewsFiltersFrame:ModPoint("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -20) + GuildNewsFiltersFrame:SetPoint("TOPLEFT", GuildFrame, "TOPRIGHT", 4, -20) SV.API:Set("ScrollFrame", GuildNewsContainerScrollBar, 4, 4) SV.API:Set("ScrollFrame", GuildInfoDetailsFrameScrollBar, 4, 4) @@ -644,7 +644,7 @@ local function GuildFrameStyle() if icon then icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) icon:ClearAllPoints() - icon:ModPoint("TOPLEFT", button, "TOPLEFT", 2, -2) + icon:SetPoint("TOPLEFT", button, "TOPLEFT", 2, -2) icon:SetParent(button.Panel) end end @@ -689,8 +689,8 @@ local function GuildControlStyle() SV.API:Set("DropDown", GuildControlUINavigationDropDown) SV.API:Set("DropDown", GuildControlUIRankSettingsFrameRankDropDown,180) - GuildControlUINavigationDropDownButton:ModWidth(20) - GuildControlUIRankSettingsFrameRankDropDownButton:ModWidth(20) + GuildControlUINavigationDropDownButton:SetWidth(20) + GuildControlUIRankSettingsFrameRankDropDownButton:SetWidth(20) for i=1, NUM_RANK_FLAGS do local check = _G["GuildControlUIRankSettingsFrameCheckbox"..i] @@ -699,8 +699,8 @@ local function GuildControlStyle() GuildControlUIRankOrderFrameNewButton:SetStyle("Button") GuildControlUIRankSettingsFrameGoldBox:SetStyle("Editbox") - GuildControlUIRankSettingsFrameGoldBox.Panel:ModPoint("TOPLEFT",-2,-4) - GuildControlUIRankSettingsFrameGoldBox.Panel:ModPoint("BOTTOMRIGHT",2,4) + GuildControlUIRankSettingsFrameGoldBox.Panel:SetPoint("TOPLEFT",-2,-4) + GuildControlUIRankSettingsFrameGoldBox.Panel:SetPoint("BOTTOMRIGHT",2,4) GuildControlUIRankSettingsFrameGoldBox:RemoveTextures() GuildControlUIRankBankFrame:RemoveTextures() @@ -708,7 +708,7 @@ local function GuildControlStyle() SV.API:Set("DropDown", GuildControlUIRankBankFrameRankDropDown, 180) - GuildControlUIRankBankFrameRankDropDownButton:ModWidth(20) + GuildControlUIRankBankFrameRankDropDownButton:SetWidth(20) end local function LFGuildFrameStyle() diff --git a/SVUI_Skins/components/blizzard/help.lua b/SVUI_Skins/components/blizzard/help.lua index c4de80e..e91d9a1 100644 --- a/SVUI_Skins/components/blizzard/help.lua +++ b/SVUI_Skins/components/blizzard/help.lua @@ -74,8 +74,8 @@ local function HelpFrameStyle() HelpFrameKnowledgebaseErrorFrame:SetFrameLevel(HelpFrameKnowledgebaseErrorFrame:GetFrameLevel()+2) HelpFrameReportBugScrollFrame:RemoveTextures() HelpFrameReportBugScrollFrame:SetStyle("Frame", "Default") - HelpFrameReportBugScrollFrame.Panel:ModPoint("TOPLEFT", -4, 4) - HelpFrameReportBugScrollFrame.Panel:ModPoint("BOTTOMRIGHT", 6, -4) + HelpFrameReportBugScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameReportBugScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) for d = 1, HelpFrameReportBug:GetNumChildren()do local e = select(d, HelpFrameReportBug:GetChildren()) if not e:GetName() then @@ -85,8 +85,8 @@ local function HelpFrameStyle() SV.API:Set("ScrollFrame", HelpFrameReportBugScrollFrameScrollBar) HelpFrameSubmitSuggestionScrollFrame:RemoveTextures() HelpFrameSubmitSuggestionScrollFrame:SetStyle("Frame", "Default") - HelpFrameSubmitSuggestionScrollFrame.Panel:ModPoint("TOPLEFT", -4, 4) - HelpFrameSubmitSuggestionScrollFrame.Panel:ModPoint("BOTTOMRIGHT", 6, -4) + HelpFrameSubmitSuggestionScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameSubmitSuggestionScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) for d = 1, HelpFrameSubmitSuggestion:GetNumChildren()do local e = select(d, HelpFrameSubmitSuggestion:GetChildren()) if not e:GetName() then @@ -96,8 +96,8 @@ local function HelpFrameStyle() SV.API:Set("ScrollFrame", HelpFrameSubmitSuggestionScrollFrameScrollBar) HelpFrameTicketScrollFrame:RemoveTextures() HelpFrameTicketScrollFrame:SetStyle("Frame", "Default") - HelpFrameTicketScrollFrame.Panel:ModPoint("TOPLEFT", -4, 4) - HelpFrameTicketScrollFrame.Panel:ModPoint("BOTTOMRIGHT", 6, -4) + HelpFrameTicketScrollFrame.Panel:SetPoint("TOPLEFT", -4, 4) + HelpFrameTicketScrollFrame.Panel:SetPoint("BOTTOMRIGHT", 6, -4) for d = 1, HelpFrameTicket:GetNumChildren()do local e = select(d, HelpFrameTicket:GetChildren()) if not e:GetName() then @@ -127,7 +127,7 @@ local function HelpFrameStyle() f:SetStyle("Button") end HelpFrameKnowledgebaseSearchBox:ClearAllPoints() - HelpFrameKnowledgebaseSearchBox:ModPoint("TOPLEFT", HelpFrameMainInset, "TOPLEFT", 13, -10) + HelpFrameKnowledgebaseSearchBox:SetPoint("TOPLEFT", HelpFrameMainInset, "TOPLEFT", 13, -10) HelpFrameKnowledgebaseNavBarOverlay:Die() HelpFrameKnowledgebaseNavBar:RemoveTextures() HelpFrame:RemoveTextures(true) diff --git a/SVUI_Skins/components/blizzard/itemsocketing.lua b/SVUI_Skins/components/blizzard/itemsocketing.lua index 9ab7223..9fcf3cd 100644 --- a/SVUI_Skins/components/blizzard/itemsocketing.lua +++ b/SVUI_Skins/components/blizzard/itemsocketing.lua @@ -50,7 +50,7 @@ local function ItemSocketStyle() end) ItemSocketingFramePortrait:Die() ItemSocketingSocketButton:ClearAllPoints() - ItemSocketingSocketButton:ModPoint("BOTTOMRIGHT", ItemSocketingFrame, "BOTTOMRIGHT", -5, 5) + ItemSocketingSocketButton:SetPoint("BOTTOMRIGHT", ItemSocketingFrame, "BOTTOMRIGHT", -5, 5) ItemSocketingSocketButton:SetStyle("Button") SV.API:Set("CloseButton", ItemSocketingFrameCloseButton) end diff --git a/SVUI_Skins/components/blizzard/lfd.lua b/SVUI_Skins/components/blizzard/lfd.lua index 42b8b7d..dfd0c23 100644 --- a/SVUI_Skins/components/blizzard/lfd.lua +++ b/SVUI_Skins/components/blizzard/lfd.lua @@ -218,12 +218,12 @@ local function LFDFrameStyle() LFDQueueFrameRoleButtonLeader.leadIcon = LFDQueueFrameRoleButtonLeader:CreateTexture(nil, 'BACKGROUND') LFDQueueFrameRoleButtonLeader.leadIcon:SetTexture([[Interface\GroupFrame\UI-Group-LeaderIcon]]) LFDQueueFrameRoleButtonLeader.leadIcon:SetPoint(LFDQueueFrameRoleButtonLeader:GetNormalTexture():GetPoint()) - LFDQueueFrameRoleButtonLeader.leadIcon:ModSize(50) + LFDQueueFrameRoleButtonLeader.leadIcon:SetSize(50) LFDQueueFrameRoleButtonLeader.leadIcon:SetAlpha(0.4) RaidFinderQueueFrameRoleButtonLeader.leadIcon = RaidFinderQueueFrameRoleButtonLeader:CreateTexture(nil, 'BACKGROUND') RaidFinderQueueFrameRoleButtonLeader.leadIcon:SetTexture([[Interface\GroupFrame\UI-Group-LeaderIcon]]) RaidFinderQueueFrameRoleButtonLeader.leadIcon:SetPoint(RaidFinderQueueFrameRoleButtonLeader:GetNormalTexture():GetPoint()) - RaidFinderQueueFrameRoleButtonLeader.leadIcon:ModSize(50) + RaidFinderQueueFrameRoleButtonLeader.leadIcon:SetSize(50) RaidFinderQueueFrameRoleButtonLeader.leadIcon:SetAlpha(0.4) hooksecurefunc('LFG_DisableRoleButton', function(self) @@ -264,7 +264,7 @@ local function LFDFrameStyle() button:SetStyle("Button") button.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) button.icon:SetDrawLayer("OVERLAY") - button.icon:ModSize(40) + button.icon:SetSize(40) button.icon:ClearAllPoints() button.icon:SetPoint("LEFT", 10, 0) button.border = CreateFrame("Frame", nil, button) diff --git a/SVUI_Skins/components/blizzard/loothistory.lua b/SVUI_Skins/components/blizzard/loothistory.lua index 72b197a..59c40cf 100644 --- a/SVUI_Skins/components/blizzard/loothistory.lua +++ b/SVUI_Skins/components/blizzard/loothistory.lua @@ -114,10 +114,10 @@ local function LootHistoryStyle() LootHistoryFrame:SetStyle("!_Frame", 'Transparent') SV.API:Set("CloseButton", LootHistoryFrame.ResizeButton) LootHistoryFrame.ResizeButton:SetStyle("!_Frame") - LootHistoryFrame.ResizeButton:ModWidth(LootHistoryFrame:GetWidth()) - LootHistoryFrame.ResizeButton:ModHeight(19) + LootHistoryFrame.ResizeButton:SetWidth(LootHistoryFrame:GetWidth()) + LootHistoryFrame.ResizeButton:SetHeight(19) LootHistoryFrame.ResizeButton:ClearAllPoints() - LootHistoryFrame.ResizeButton:ModPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) + LootHistoryFrame.ResizeButton:SetPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) LootHistoryFrame.ResizeButton:SetNormalTexture("") local txt = LootHistoryFrame.ResizeButton:CreateFontString(nil,"OVERLAY") diff --git a/SVUI_Skins/components/blizzard/macro.lua b/SVUI_Skins/components/blizzard/macro.lua index 7915c07..3f9eacd 100644 --- a/SVUI_Skins/components/blizzard/macro.lua +++ b/SVUI_Skins/components/blizzard/macro.lua @@ -38,7 +38,7 @@ local function MacroUIStyle() SV.API:Set("ScrollFrame", MacroFrameScrollFrameScrollBar) SV.API:Set("ScrollFrame", MacroPopupScrollFrameScrollBar) - MacroFrame:ModWidth(360) + MacroFrame:SetWidth(360) local parentStrata = MacroFrame:GetFrameStrata() local parentLevel = MacroFrame:GetFrameLevel() @@ -65,12 +65,12 @@ local function MacroUIStyle() for i = 1, 2 do local tab = _G[("MacroFrameTab%d"):format(i)] if(tab) then - tab:ModHeight(22) + tab:SetHeight(22) if(i == 1) then - tab:ModPoint("TOPLEFT", MacroFrame, "TOPLEFT", 85, -39) + tab:SetPoint("TOPLEFT", MacroFrame, "TOPLEFT", 85, -39) firstTab = tab elseif(firstTab) then - tab:ModPoint("LEFT", firstTab, "RIGHT", 4, 0) + tab:SetPoint("LEFT", firstTab, "RIGHT", 4, 0) end end end @@ -84,8 +84,8 @@ local function MacroUIStyle() MacroPopupScrollFrame:RemoveTextures() MacroPopupScrollFrame:SetStyle("Frame", "Pattern") - MacroPopupScrollFrame.Panel:ModPoint("TOPLEFT", 51, 2) - MacroPopupScrollFrame.Panel:ModPoint("BOTTOMRIGHT", -4, 4) + MacroPopupScrollFrame.Panel:SetPoint("TOPLEFT", 51, 2) + MacroPopupScrollFrame.Panel:SetPoint("BOTTOMRIGHT", -4, 4) MacroPopupEditBox:SetStyle("Editbox") MacroPopupNameLeft:SetTexture("") MacroPopupNameMiddle:SetTexture("") @@ -99,7 +99,7 @@ local function MacroUIStyle() MacroPopupFrame:HookScript("OnShow", function(c) c:ClearAllPoints() - c:ModPoint("TOPLEFT", MacroFrame, "TOPRIGHT", 5, -2) + c:SetPoint("TOPLEFT", MacroFrame, "TOPRIGHT", 5, -2) end) MacroFrameSelectedMacroButton:SetFrameStrata(parentStrata) @@ -110,10 +110,10 @@ local function MacroUIStyle() MacroFrameSelectedMacroButtonIcon:InsetPoints() MacroEditButton:ClearAllPoints() - MacroEditButton:ModPoint("BOTTOMLEFT", MacroFrameSelectedMacroButton.Panel, "BOTTOMRIGHT", 10, 0) + MacroEditButton:SetPoint("BOTTOMLEFT", MacroFrameSelectedMacroButton.Panel, "BOTTOMRIGHT", 10, 0) MacroFrameCharLimitText:ClearAllPoints() - MacroFrameCharLimitText:ModPoint("BOTTOM", MacroFrameTextBackground, -25, -35) + MacroFrameCharLimitText:SetPoint("BOTTOM", MacroFrameTextBackground, -25, -35) for i = 1, MAX_ACCOUNT_MACROS do local button = _G["MacroButton"..i] diff --git a/SVUI_Skins/components/blizzard/mailbox.lua b/SVUI_Skins/components/blizzard/mailbox.lua index 052ad42..803fad7 100644 --- a/SVUI_Skins/components/blizzard/mailbox.lua +++ b/SVUI_Skins/components/blizzard/mailbox.lua @@ -46,8 +46,8 @@ local function MailBoxStyle() local i = _G["MailItem"..b] i:RemoveTextures() i:SetStyle("Frame", "Inset") - i.Panel:ModPoint("TOPLEFT", 2, 1) - i.Panel:ModPoint("BOTTOMRIGHT", -2, 2) + i.Panel:SetPoint("TOPLEFT", 2, 1) + i.Panel:SetPoint("BOTTOMRIGHT", -2, 2) local d = _G["MailItem"..b.."Button"] d:RemoveTextures() d:SetStyle("Button") @@ -74,17 +74,17 @@ local function MailBoxStyle() SendMailMoneyInset:RemoveTextures() _G["SendMailMoneySilver"]:SetStyle("Editbox") - _G["SendMailMoneySilver"].Panel:ModPoint("TOPLEFT", -2, 1) - _G["SendMailMoneySilver"].Panel:ModPoint("BOTTOMRIGHT", -12, -1) + _G["SendMailMoneySilver"].Panel:SetPoint("TOPLEFT", -2, 1) + _G["SendMailMoneySilver"].Panel:SetPoint("BOTTOMRIGHT", -12, -1) _G["SendMailMoneySilver"]:SetTextInsets(-1, -1, -2, -2) _G["SendMailMoneyCopper"]:SetStyle("Editbox") - _G["SendMailMoneyCopper"].Panel:ModPoint("TOPLEFT", -2, 1) - _G["SendMailMoneyCopper"].Panel:ModPoint("BOTTOMRIGHT", -12, -1) + _G["SendMailMoneyCopper"].Panel:SetPoint("TOPLEFT", -2, 1) + _G["SendMailMoneyCopper"].Panel:SetPoint("BOTTOMRIGHT", -12, -1) _G["SendMailMoneyCopper"]:SetTextInsets(-1, -1, -2, -2) - SendMailNameEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 4) - SendMailSubjectEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 0) + SendMailNameEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 4) + SendMailSubjectEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 0) SendMailFrame:RemoveTextures() hooksecurefunc("SendMailFrame_Update", MailFrame_OnUpdate) @@ -127,9 +127,9 @@ local function MailBoxStyle() e:InsetPoints() end end - OpenMailReplyButton:ModPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) - OpenMailDeleteButton:ModPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) - SendMailMailButton:ModPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) + OpenMailReplyButton:SetPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) + OpenMailDeleteButton:SetPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) + SendMailMailButton:SetPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/merchant.lua b/SVUI_Skins/components/blizzard/merchant.lua index 3e0389e..638c065 100644 --- a/SVUI_Skins/components/blizzard/merchant.lua +++ b/SVUI_Skins/components/blizzard/merchant.lua @@ -50,11 +50,11 @@ local function MerchantStyle() o:SetStyle("!_Frame", "Inset") d:RemoveTextures() d:SetStyle("Button") - d:ModPoint("TOPLEFT", o, "TOPLEFT", 4, -4) + d:SetPoint("TOPLEFT", o, "TOPLEFT", 4, -4) e:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) e:InsetPoints() _G["MerchantItem"..b.."MoneyFrame"]:ClearAllPoints() - _G["MerchantItem"..b.."MoneyFrame"]:ModPoint("BOTTOMLEFT", d, "BOTTOMRIGHT", 3, 0) + _G["MerchantItem"..b.."MoneyFrame"]:SetPoint("BOTTOMLEFT", d, "BOTTOMRIGHT", 3, 0) end MerchantBuyBackItemItemButton:RemoveTextures() MerchantBuyBackItemItemButton:SetStyle("Button") @@ -73,7 +73,7 @@ local function MerchantStyle() MerchantRepairAllButton:SetStyle("Button") MerchantRepairAllIcon:SetTexCoord(0.34, 0.1, 0.34, 0.535, 0.535, 0.1, 0.535, 0.535) MerchantRepairAllIcon:InsetPoints() - MerchantFrame:ModWidth(360) + MerchantFrame:SetWidth(360) SV.API:Set("CloseButton", MerchantFrameCloseButton, MerchantFrame.Panel) SV.API:Set("PageButton", MerchantNextPageButton) SV.API:Set("PageButton", MerchantPrevPageButton) diff --git a/SVUI_Skins/components/blizzard/misc.lua b/SVUI_Skins/components/blizzard/misc.lua index c95471c..51cab55 100644 --- a/SVUI_Skins/components/blizzard/misc.lua +++ b/SVUI_Skins/components/blizzard/misc.lua @@ -177,19 +177,19 @@ local function MiscStyles() end if(SV.db.Skins.blizzard.dressingroom) then - DressUpFrame:ModSize(500, 600) + DressUpFrame:SetSize(500, 600) SV.API:Set("Window", DressUpFrame, true, true) DressUpModel:ClearAllPoints() - DressUpModel:ModPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) - DressUpModel:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) + DressUpModel:SetPoint("TOPLEFT", DressUpFrame, "TOPLEFT", 12, -76) + DressUpModel:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 36) DressUpModel:SetStyle("!_Frame", "Model") - DressUpFrameCancelButton:ModPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) + DressUpFrameCancelButton:SetPoint("BOTTOMRIGHT", DressUpFrame, "BOTTOMRIGHT", -12, 12) DressUpFrameCancelButton:SetStyle("Button") - DressUpFrameResetButton:ModPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) + DressUpFrameResetButton:SetPoint("RIGHT", DressUpFrameCancelButton, "LEFT", -12, 0) DressUpFrameResetButton:SetStyle("Button") SV.API:Set("CloseButton", DressUpFrameCloseButton, DressUpFrame.Panel) @@ -223,7 +223,7 @@ local function MiscStyles() GossipGreetingScrollFrame.spellTex = GossipGreetingScrollFrame:CreateTexture(nil, "ARTWORK") GossipGreetingScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) GossipGreetingScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - GossipGreetingScrollFrame.spellTex:ModSize(506, 615) + GossipGreetingScrollFrame.spellTex:SetSize(506, 615) GossipGreetingScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) _G["GossipFramePortrait"]:Die() _G["GossipFrameGreetingGoodbyeButton"]:RemoveTextures() @@ -237,7 +237,7 @@ local function MiscStyles() NPCFriendshipStatusBar:ClearAllPoints() NPCFriendshipStatusBar:SetPoint("TOPLEFT", GossipFrame, "TOPLEFT", 58, -34) - NPCFriendshipStatusBar.icon:ModSize(32,32) + NPCFriendshipStatusBar.icon:SetSize(32,32) NPCFriendshipStatusBar.icon:ClearAllPoints() NPCFriendshipStatusBar.icon:SetPoint("RIGHT", NPCFriendshipStatusBar, "LEFT", 0, -2) end @@ -268,7 +268,7 @@ local function MiscStyles() end end - GuildRegistrarFrameEditBox:ModHeight(20) + GuildRegistrarFrameEditBox:SetHeight(20) if(_G["GuildRegistrarButton1"]) then _G["GuildRegistrarButton1"]:GetFontString():SetTextColor(1, 1, 1) @@ -301,10 +301,10 @@ local function MiscStyles() LootHistoryFrame:SetStyle("!_Frame", 'Transparent') SV.API:Set("CloseButton", LootHistoryFrame.ResizeButton) LootHistoryFrame.ResizeButton:SetStyle("!_Frame") - LootHistoryFrame.ResizeButton:ModWidth(LootHistoryFrame:GetWidth()) - LootHistoryFrame.ResizeButton:ModHeight(19) + LootHistoryFrame.ResizeButton:SetWidth(LootHistoryFrame:GetWidth()) + LootHistoryFrame.ResizeButton:SetHeight(19) LootHistoryFrame.ResizeButton:ClearAllPoints() - LootHistoryFrame.ResizeButton:ModPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) + LootHistoryFrame.ResizeButton:SetPoint("TOP", LootHistoryFrame, "BOTTOM", 0, -2) LootHistoryFrame.ResizeButton:SetNormalTexture("") local txt = LootHistoryFrame.ResizeButton:CreateFontString(nil,"OVERLAY") @@ -363,27 +363,27 @@ local function MiscStyles() SV.API:Set("ScrollFrame", SendMailScrollFrameScrollBar) SendMailNameEditBox:SetStyle("Editbox") - SendMailNameEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 4) + SendMailNameEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 4) SendMailSubjectEditBox:SetStyle("Editbox") - SendMailSubjectEditBox.Panel:ModPoint("BOTTOMRIGHT", 2, 0) + SendMailSubjectEditBox.Panel:SetPoint("BOTTOMRIGHT", 2, 0) SendMailMoneyGold:SetStyle("Editbox") SendMailMoneySilver:SetStyle("Editbox") - SendMailMoneySilver.Panel:ModPoint("TOPLEFT", -2, 1) - SendMailMoneySilver.Panel:ModPoint("BOTTOMRIGHT", -12, -1) + SendMailMoneySilver.Panel:SetPoint("TOPLEFT", -2, 1) + SendMailMoneySilver.Panel:SetPoint("BOTTOMRIGHT", -12, -1) SendMailMoneySilver:SetTextInsets(-1, -1, -2, -2) SendMailMoneyCopper:SetStyle("Editbox") - SendMailMoneyCopper.Panel:ModPoint("TOPLEFT", -2, 1) - SendMailMoneyCopper.Panel:ModPoint("BOTTOMRIGHT", -12, -1) + SendMailMoneyCopper.Panel:SetPoint("TOPLEFT", -2, 1) + SendMailMoneyCopper.Panel:SetPoint("BOTTOMRIGHT", -12, -1) SendMailMoneyCopper:SetTextInsets(-1, -1, -2, -2) hooksecurefunc("SendMailFrame_Update", MailFrame_OnUpdate) SendMailCancelButton:SetStyle("Button") SendMailMailButton:SetStyle("Button") - SendMailMailButton:ModPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) + SendMailMailButton:SetPoint("RIGHT", SendMailCancelButton, "LEFT", -2, 0) OpenMailFrame:RemoveTextures(true) OpenMailFrame:SetStyle("!_Frame", "Transparent", true) @@ -392,9 +392,9 @@ local function MiscStyles() OpenMailReportSpamButton:SetStyle("Button") OpenMailCancelButton:SetStyle("Button") OpenMailDeleteButton:SetStyle("Button") - OpenMailDeleteButton:ModPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) + OpenMailDeleteButton:SetPoint("RIGHT", OpenMailCancelButton, "LEFT", -2, 0) OpenMailReplyButton:SetStyle("Button") - OpenMailReplyButton:ModPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) + OpenMailReplyButton:SetPoint("RIGHT", OpenMailDeleteButton, "LEFT", -2, 0) SV.API:Set("CloseButton", OpenMailFrameCloseButton) @@ -423,8 +423,8 @@ local function MiscStyles() if(slot) then slot:RemoveTextures() slot:SetStyle("Frame", "Inset") - slot.Panel:ModPoint("TOPLEFT", 2, 1) - slot.Panel:ModPoint("BOTTOMRIGHT", -2, 2) + slot.Panel:SetPoint("TOPLEFT", 2, 1) + slot.Panel:SetPoint("BOTTOMRIGHT", -2, 2) local button = _G["MailItem"..i.."Button"] if(button) then @@ -458,7 +458,7 @@ local function MiscStyles() MerchantFrame:RemoveTextures(true) MerchantFrame:SetStyle("Frame", "Window", false, nil, 2, 4) - MerchantFrame:ModWidth(360) + MerchantFrame:SetWidth(360) local level = MerchantFrame:GetFrameLevel() if(level > 0) then @@ -496,7 +496,7 @@ local function MiscStyles() if(button) then button:RemoveTextures() button:SetStyle("!_ActionSlot") - button:ModPoint("TOPLEFT", slot, "TOPLEFT", 4, -4) + button:SetPoint("TOPLEFT", slot, "TOPLEFT", 4, -4) local icon = _G["MerchantItem"..i.."ItemButtonIconTexture"] if(icon) then icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) @@ -505,7 +505,7 @@ local function MiscStyles() local money = _G["MerchantItem"..i.."MoneyFrame"] if(money) then money:ClearAllPoints() - money:ModPoint("BOTTOMLEFT", button, "BOTTOMRIGHT", 3, 0) + money:SetPoint("BOTTOMLEFT", button, "BOTTOMRIGHT", 3, 0) end end end @@ -565,8 +565,8 @@ local function MiscStyles() PetitionFrameInstructions:SetTextColor(1, 1, 1) - PetitionFrameRenameButton:ModPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) - PetitionFrameRenameButton:ModPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) + PetitionFrameRenameButton:SetPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) + PetitionFrameRenameButton:SetPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) end if(SV.db.Skins.blizzard.stable) then @@ -676,13 +676,13 @@ local function MiscStyles() TradePlayerInputMoneyFrameGold:SetStyle("Editbox") TradePlayerInputMoneyFrameSilver:SetStyle("Editbox") - TradePlayerInputMoneyFrameSilver.Panel:ModPoint("TOPLEFT", -2, 1) - TradePlayerInputMoneyFrameSilver.Panel:ModPoint("BOTTOMRIGHT", -12, -1) + TradePlayerInputMoneyFrameSilver.Panel:SetPoint("TOPLEFT", -2, 1) + TradePlayerInputMoneyFrameSilver.Panel:SetPoint("BOTTOMRIGHT", -12, -1) TradePlayerInputMoneyFrameSilver:SetTextInsets(-1, -1, -2, -2) TradePlayerInputMoneyFrameCopper:SetStyle("Editbox") - TradePlayerInputMoneyFrameCopper.Panel:ModPoint("TOPLEFT", -2, 1) - TradePlayerInputMoneyFrameCopper.Panel:ModPoint("BOTTOMRIGHT", -12, -1) + TradePlayerInputMoneyFrameCopper.Panel:SetPoint("TOPLEFT", -2, 1) + TradePlayerInputMoneyFrameCopper.Panel:SetPoint("BOTTOMRIGHT", -12, -1) TradePlayerInputMoneyFrameCopper:SetTextInsets(-1, -1, -2, -2) for i = 1, 7 do diff --git a/SVUI_Skins/components/blizzard/petbattle.lua b/SVUI_Skins/components/blizzard/petbattle.lua index 2509597..5cf1c25 100644 --- a/SVUI_Skins/components/blizzard/petbattle.lua +++ b/SVUI_Skins/components/blizzard/petbattle.lua @@ -225,7 +225,7 @@ local function PetBattleStyle() frame.HealthBarBackdrop:SetWidth(frame.healthBarWidth + 4) frame.ActualHealthBar:SetTexture(SV.media.statusbar.default) frame.PetTypeFrame = CreateFrame("Frame", nil, frame) - frame.PetTypeFrame:ModSize(100, 23) + frame.PetTypeFrame:SetSize(100, 23) frame.PetTypeFrame.text = frame.PetTypeFrame:CreateFontString(nil, 'OVERLAY') frame.PetTypeFrame.text:SetFont(SV.media.font.default, 12, "OUTLINE") frame.PetTypeFrame.text:SetText("") @@ -233,7 +233,7 @@ local function PetBattleStyle() frame.Name:SetFontObject(SystemFont_Shadow_Outline_Huge2) frame.Name:ClearAllPoints() frame.FirstAttack = frame:CreateTexture(nil, "ARTWORK") - frame.FirstAttack:ModSize(30) + frame.FirstAttack:SetSize(30) frame.FirstAttack:SetTexture("Interface\\PetBattles\\PetBattle-StatIcons") if i == 1 then frame.HealthBarBackdrop:SetPoint('TOPLEFT', frame.ActualHealthBar, 'TOPLEFT', -1, 1) @@ -287,7 +287,7 @@ local function PetBattleStyle() frame.BorderAlive:SetAlpha(0) frame.HealthBarBG:SetAlpha(0) frame.HealthDivider:SetAlpha(0) - frame:ModSize(40) + frame:SetSize(40) frame.IconBackdrop = CreateFrame("Frame", nil, frame) frame.IconBackdrop:SetFrameLevel(0) @@ -302,7 +302,7 @@ local function PetBattleStyle() frame.HealthBarBackdrop = CreateFrame("Frame", nil, frame) frame.HealthBarBackdrop:SetFrameLevel(frame:GetFrameLevel()-1) frame.HealthBarBackdrop:SetStyle("Frame", "Bar") - frame.HealthBarBackdrop:ModWidth(frame.healthBarWidth + 4) + frame.HealthBarBackdrop:SetWidth(frame.healthBarWidth + 4) frame.HealthBarBackdrop:SetPoint('TOPLEFT', frame.ActualHealthBar, 'TOPLEFT', -1, 1) frame.HealthBarBackdrop:SetPoint('BOTTOMLEFT', frame.ActualHealthBar, 'BOTTOMLEFT', -1, -1) frame.hasTempBG = true @@ -336,11 +336,11 @@ local function PetBattleStyle() BottomFrame.TurnTimer.SkipButton:ClearAllPoints() BottomFrame.TurnTimer.SkipButton:SetParent(PetBattleActionBar) - BottomFrame.TurnTimer.SkipButton:ModSize((PBAB_WIDTH * 0.2) - 4, 18) + BottomFrame.TurnTimer.SkipButton:SetSize((PBAB_WIDTH * 0.2) - 4, 18) BottomFrame.TurnTimer.SkipButton:SetPoint("BOTTOMLEFT", PetBattleActionBar.Panel, "TOPLEFT", 2, 2) BottomFrame.TurnTimer.SkipButton:SetStyle("Button") - BottomFrame.TurnTimer:ModSize(BottomFrame.TurnTimer.SkipButton:GetWidth(), BottomFrame.TurnTimer.SkipButton:GetHeight()) + BottomFrame.TurnTimer:SetSize(BottomFrame.TurnTimer.SkipButton:GetWidth(), BottomFrame.TurnTimer.SkipButton:GetHeight()) BottomFrame.TurnTimer:ClearAllPoints() BottomFrame.TurnTimer:SetPoint("TOP", SV.Screen, "TOP", 0, -140) BottomFrame.TurnTimer.TimerText:SetPoint("CENTER") @@ -352,7 +352,7 @@ local function PetBattleStyle() BottomFrame.xpBar:ClearAllPoints() BottomFrame.xpBar:RemoveTextures() BottomFrame.xpBar:SetParent(PetBattleActionBar) - BottomFrame.xpBar:ModSize((PBAB_WIDTH * 0.8) - 4, 16) + BottomFrame.xpBar:SetSize((PBAB_WIDTH * 0.8) - 4, 16) BottomFrame.xpBar:SetStatusBarTexture(SV.media.statusbar.default) BottomFrame.xpBar:SetStyle("Frame", "Bar") BottomFrame.xpBar:SetPoint("BOTTOMRIGHT", PetBattleActionBar.Panel, "TOPRIGHT", -3, 3) diff --git a/SVUI_Skins/components/blizzard/petition.lua b/SVUI_Skins/components/blizzard/petition.lua index bfd8bc8..678cdd3 100644 --- a/SVUI_Skins/components/blizzard/petition.lua +++ b/SVUI_Skins/components/blizzard/petition.lua @@ -48,8 +48,8 @@ local function PetitionFrameStyle() PetitionFrameInstructions:SetTextColor(1, 1, 1) - PetitionFrameRenameButton:ModPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) - PetitionFrameRenameButton:ModPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) + PetitionFrameRenameButton:SetPoint("LEFT", PetitionFrameRequestButton, "RIGHT", 3, 0) + PetitionFrameRenameButton:SetPoint("RIGHT", PetitionFrameCancelButton, "LEFT", -3, 0) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua index c7d8db1..ce9d147 100644 --- a/SVUI_Skins/components/blizzard/pvp.lua +++ b/SVUI_Skins/components/blizzard/pvp.lua @@ -55,7 +55,7 @@ local function PVPFrameStyle() btn.Background:Die() btn.Ring:Die() btn:SetStyle("Button") - btn.Icon:ModSize(45) + btn.Icon:SetSize(45) btn.Icon:SetTexCoord(.15, .85, .15, .85) btn.Icon:SetDrawLayer("OVERLAY", nil, 7) btn.Panel:WrapPoints(btn.Icon) diff --git a/SVUI_Skins/components/blizzard/quest.lua b/SVUI_Skins/components/blizzard/quest.lua index e2217a0..1e3a6a6 100644 --- a/SVUI_Skins/components/blizzard/quest.lua +++ b/SVUI_Skins/components/blizzard/quest.lua @@ -39,7 +39,7 @@ local function QuestScrollHelper(b, c, d, e) else b.spellTex:SetPoint("TOPLEFT") end - b.spellTex:ModSize(c or 506, d or 615) + b.spellTex:SetSize(c or 506, d or 615) b.spellTex:SetTexCoord(0, 1, 0.02, 1) end @@ -47,10 +47,10 @@ local QuestRewardScrollFrame_OnShow = function(self) if(not self.Panel) then self:SetStyle("Frame", "Default") QuestScrollHelper(self, 509, 630, false) - self:ModHeight(self:GetHeight() - 2) + self:SetHeight(self:GetHeight() - 2) end if(self.spellTex) then - self.spellTex:ModHeight(self:GetHeight() + 217) + self.spellTex:SetHeight(self:GetHeight() + 217) end end @@ -91,7 +91,7 @@ local _hook_DetailScrollShow = function(self) self:SetStyle("Frame", "Default") QuestScrollHelper(self, 509, 630, false) end - self.spellTex:ModHeight(self:GetHeight() + 217) + self.spellTex:SetHeight(self:GetHeight() + 217) end local _hook_QuestLogPopupDetailFrameShow = function(self) @@ -101,7 +101,7 @@ local _hook_QuestLogPopupDetailFrameShow = function(self) QuestLogPopupDetailFrameScrollFrame.spellTex = QuestLogPopupDetailFrameScrollFrame:CreateTexture(nil, 'ARTWORK') QuestLogPopupDetailFrameScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBookBG]]) QuestLogPopupDetailFrameScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - QuestLogPopupDetailFrameScrollFrame.spellTex:ModSize(514, 616) + QuestLogPopupDetailFrameScrollFrame.spellTex:SetSize(514, 616) QuestLogPopupDetailFrameScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) QuestLogPopupDetailFrameScrollFrame.spellTex2 = QuestLogPopupDetailFrameScrollFrame:CreateTexture(nil, 'BORDER') QuestLogPopupDetailFrameScrollFrame.spellTex2:SetTexture([[Interface\FrameGeneral\UI-Background-Rock]]) @@ -124,7 +124,7 @@ local function QuestFrameStyle() QuestInfoItemHighlight:RemoveTextures() QuestInfoItemHighlight:SetStyle("Frame", "Icon") - QuestInfoItemHighlight:ModSize(148, 40) + QuestInfoItemHighlight:SetSize(148, 40) local choiceBG = QuestInfoItemHighlight:CreateTexture(nil, "BACKGROUND") choiceBG:SetAllPoints(QuestInfoItemHighlight) @@ -165,7 +165,7 @@ local function QuestFrameStyle() end QuestInfoSkillPointFrame:RemoveTextures() - QuestInfoSkillPointFrame:ModWidth(QuestInfoSkillPointFrame:GetWidth() - 4) + QuestInfoSkillPointFrame:SetWidth(QuestInfoSkillPointFrame:GetWidth() - 4) local curLvl = QuestInfoSkillPointFrame:GetFrameLevel() + 1 QuestInfoSkillPointFrame:SetFrameLevel(curLvl) @@ -174,7 +174,7 @@ local function QuestFrameStyle() QuestInfoSkillPointFrameIconTexture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) QuestInfoSkillPointFrameIconTexture:SetDrawLayer("OVERLAY") QuestInfoSkillPointFrameIconTexture:SetPoint("TOPLEFT", 2, -2) - QuestInfoSkillPointFrameIconTexture:ModSize(QuestInfoSkillPointFrameIconTexture:GetWidth()-2, QuestInfoSkillPointFrameIconTexture:GetHeight()-2) + QuestInfoSkillPointFrameIconTexture:SetSize(QuestInfoSkillPointFrameIconTexture:GetWidth()-2, QuestInfoSkillPointFrameIconTexture:GetHeight()-2) QuestInfoSkillPointFrameCount:SetDrawLayer("OVERLAY") hooksecurefunc("QuestInfoItem_OnClick", Hook_QuestInfoItem_OnClick) @@ -209,11 +209,11 @@ local function QuestFrameStyle() local texture = _G["QuestProgressItem"..j.."IconTexture"] i:RemoveTextures() i:SetStyle("!_Frame", "Inset") - i:ModWidth(_G["QuestProgressItem"..j]:GetWidth() - 4) + i:SetWidth(_G["QuestProgressItem"..j]:GetWidth() - 4) texture:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) texture:SetDrawLayer("OVERLAY") texture:SetPoint("TOPLEFT", 2, -2) - texture:ModSize(texture:GetWidth() - 2, texture:GetHeight() - 2) + texture:SetSize(texture:GetWidth() - 2, texture:GetHeight() - 2) _G["QuestProgressItem"..j.."Count"]:SetDrawLayer("OVERLAY") end diff --git a/SVUI_Skins/components/blizzard/raid.lua b/SVUI_Skins/components/blizzard/raid.lua index cb3cfce..08b41b7 100644 --- a/SVUI_Skins/components/blizzard/raid.lua +++ b/SVUI_Skins/components/blizzard/raid.lua @@ -81,8 +81,8 @@ local function RaidInfoStyle() RaidInfoScrollFrame:RemoveTextures() RaidInfoFrame:SetStyle("Frame", 'Transparent') - RaidInfoFrame.Panel:ModPoint("TOPLEFT", RaidInfoFrame, "TOPLEFT") - RaidInfoFrame.Panel:ModPoint("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") + RaidInfoFrame.Panel:SetPoint("TOPLEFT", RaidInfoFrame, "TOPLEFT") + RaidInfoFrame.Panel:SetPoint("BOTTOMRIGHT", RaidInfoFrame, "BOTTOMRIGHT") SV.API:Set("CloseButton", RaidInfoCloseButton, RaidInfoFrame) SV.API:Set("ScrollFrame", RaidInfoScrollFrameScrollBar) diff --git a/SVUI_Skins/components/blizzard/reforging.lua b/SVUI_Skins/components/blizzard/reforging.lua index 968610d..067af9b 100644 --- a/SVUI_Skins/components/blizzard/reforging.lua +++ b/SVUI_Skins/components/blizzard/reforging.lua @@ -24,8 +24,8 @@ local function ReforgingStyle() ReforgingFrame.ButtonFrame:RemoveTextures() ReforgingFrameReforgeButton:ClearAllPoints() - ReforgingFrameReforgeButton:ModPoint("LEFT", ReforgingFrameRestoreButton, "RIGHT", 2, 0) - ReforgingFrameReforgeButton:ModPoint("BOTTOMRIGHT", -3, 3) + ReforgingFrameReforgeButton:SetPoint("LEFT", ReforgingFrameRestoreButton, "RIGHT", 2, 0) + ReforgingFrameReforgeButton:SetPoint("BOTTOMRIGHT", -3, 3) ReforgingFrame.RestoreMessage:SetTextColor(1, 1, 1) ReforgingFrameRestoreButton:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/spellbook.lua b/SVUI_Skins/components/blizzard/spellbook.lua index 7f7b6e2..36e5f0d 100644 --- a/SVUI_Skins/components/blizzard/spellbook.lua +++ b/SVUI_Skins/components/blizzard/spellbook.lua @@ -87,7 +87,7 @@ local function ChangeTabHelper(tab) tab:SetScript("OnLeave", Tab_OnLeave) local a1, p, a2, x, y = tab:GetPoint() - tab:ModPoint(a1, p, a2, 1, y) + tab:SetPoint(a1, p, a2, 1, y) end local function GetSpecTabHelper(index) diff --git a/SVUI_Skins/components/blizzard/system.lua b/SVUI_Skins/components/blizzard/system.lua index 62b5708..8e44bca 100644 --- a/SVUI_Skins/components/blizzard/system.lua +++ b/SVUI_Skins/components/blizzard/system.lua @@ -460,8 +460,8 @@ local function SystemPanelQue() _G["StaticPopup"..i.."MoneyInputFrameGold"]:SetStyle("Editbox") _G["StaticPopup"..i.."MoneyInputFrameSilver"]:SetStyle("Editbox") _G["StaticPopup"..i.."MoneyInputFrameCopper"]:SetStyle("Editbox") - _G["StaticPopup"..i.."EditBox"].Panel:ModPoint("TOPLEFT", -2, -4) - _G["StaticPopup"..i.."EditBox"].Panel:ModPoint("BOTTOMRIGHT", 2, 4) + _G["StaticPopup"..i.."EditBox"].Panel:SetPoint("TOPLEFT", -2, -4) + _G["StaticPopup"..i.."EditBox"].Panel:SetPoint("BOTTOMRIGHT", 2, 4) _G["StaticPopup"..i.."ItemFrameNameFrame"]:Die() _G["StaticPopup"..i.."ItemFrame"]:GetNormalTexture():Die() _G["StaticPopup"..i.."ItemFrame"]:SetStyle("!_Frame", "Default") @@ -566,20 +566,20 @@ local function SystemPanelQue() local tPoint, tRTo, tRP, tX, tY = MacOptionsButtonCompress:GetPoint() MacOptionsButtonCompress:SetWidth(136) MacOptionsButtonCompress:ClearAllPoints() - MacOptionsButtonCompress:ModPoint(tPoint, tRTo, tRP, 4, tY) + MacOptionsButtonCompress:SetPoint(tPoint, tRTo, tRP, 4, tY) MacOptionsFrameCancel:SetWidth(96) MacOptionsFrameCancel:SetHeight(22) tPoint, tRTo, tRP, tX, tY = MacOptionsFrameCancel:GetPoint() MacOptionsFrameCancel:ClearAllPoints() - MacOptionsFrameCancel:ModPoint(tPoint, tRTo, tRP, -14, tY) + MacOptionsFrameCancel:SetPoint(tPoint, tRTo, tRP, -14, tY) MacOptionsFrameOkay:ClearAllPoints() MacOptionsFrameOkay:SetWidth(96) MacOptionsFrameOkay:SetHeight(22) - MacOptionsFrameOkay:ModPoint("LEFT",MacOptionsFrameCancel, -99,0) + MacOptionsFrameOkay:SetPoint("LEFT",MacOptionsFrameCancel, -99,0) MacOptionsButtonKeybindings:ClearAllPoints() MacOptionsButtonKeybindings:SetWidth(96) MacOptionsButtonKeybindings:SetHeight(22) - MacOptionsButtonKeybindings:ModPoint("LEFT",MacOptionsFrameOkay, -99,0) + MacOptionsButtonKeybindings:SetPoint("LEFT",MacOptionsFrameOkay, -99,0) MacOptionsFrameDefaults:SetWidth(96) MacOptionsFrameDefaults:SetHeight(22) end @@ -661,7 +661,7 @@ local function SystemPanelQue() end end AudioOptionsVoicePanelChatMode1KeyBindingButton:ClearAllPoints() - AudioOptionsVoicePanelChatMode1KeyBindingButton:ModPoint("CENTER", AudioOptionsVoicePanelBinding, "CENTER", 0, -10) + AudioOptionsVoicePanelChatMode1KeyBindingButton:SetPoint("CENTER", AudioOptionsVoicePanelBinding, "CENTER", 0, -10) CompactUnitFrameProfilesRaidStylePartyFrames:SetStyle("Checkbox") CompactUnitFrameProfilesGeneralOptionsFrameResetPositionButton:SetStyle("Button") @@ -727,7 +727,7 @@ local function SystemPanelQue() SideDressUpFrame:RemoveTextures(true) - SideDressUpFrame:ModSize(300, 400) + SideDressUpFrame:SetSize(300, 400) SideDressUpModel:RemoveTextures(true) SideDressUpModel:SetAllPoints(SideDressUpFrame) SideDressUpModel:SetStyle("!_Frame", "Model") diff --git a/SVUI_Skins/components/blizzard/tabard.lua b/SVUI_Skins/components/blizzard/tabard.lua index 832ed2f..a13ff16 100644 --- a/SVUI_Skins/components/blizzard/tabard.lua +++ b/SVUI_Skins/components/blizzard/tabard.lua @@ -64,10 +64,10 @@ local function TabardFrameStyle() SV.API:Set("PageButton", _G[c.."RightButton"]) if b > 1 then _G[c]:ClearAllPoints() - _G[c]:ModPoint("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) + _G[c]:SetPoint("TOP", _G["TabardFrameCustomization"..b-1], "BOTTOM", 0, -6) else local d, e, f, g, h = _G[c]:GetPoint() - _G[c]:ModPoint(d, e, f, g, h + 4) + _G[c]:SetPoint(d, e, f, g, h + 4) end end TabardCharacterModelRotateLeftButton:SetPoint("BOTTOMLEFT", 4, 4) diff --git a/SVUI_Skins/components/blizzard/talents.lua b/SVUI_Skins/components/blizzard/talents.lua index 3fdc1bf..dfcfda2 100644 --- a/SVUI_Skins/components/blizzard/talents.lua +++ b/SVUI_Skins/components/blizzard/talents.lua @@ -103,7 +103,7 @@ local function TalentFrameStyle() PlayerTalentFrameTalents:RemoveTextures() PlayerTalentFrameTalentsClearInfoFrame:RemoveTextures() - PlayerTalentFrame.Panel:ModPoint("BOTTOMRIGHT", PlayerTalentFrame, "BOTTOMRIGHT", 0, -5) + PlayerTalentFrame.Panel:SetPoint("BOTTOMRIGHT", PlayerTalentFrame, "BOTTOMRIGHT", 0, -5) PlayerTalentFrameSpecializationTutorialButton:Die() PlayerTalentFrameTalentsTutorialButton:Die() PlayerTalentFramePetSpecializationTutorialButton:Die() @@ -122,23 +122,23 @@ local function TalentFrameStyle() PlayerTalentFrameTalents:SetStyle("!_Frame", "Inset") PlayerTalentFrameTalentsClearInfoFrame.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) - PlayerTalentFrameTalentsClearInfoFrame:ModWidth(PlayerTalentFrameTalentsClearInfoFrame:GetWidth()-2) - PlayerTalentFrameTalentsClearInfoFrame:ModHeight(PlayerTalentFrameTalentsClearInfoFrame:GetHeight()-2) - PlayerTalentFrameTalentsClearInfoFrame.icon:ModSize(PlayerTalentFrameTalentsClearInfoFrame:GetSize()) - PlayerTalentFrameTalentsClearInfoFrame:ModPoint('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) + PlayerTalentFrameTalentsClearInfoFrame:SetWidth(PlayerTalentFrameTalentsClearInfoFrame:GetWidth()-2) + PlayerTalentFrameTalentsClearInfoFrame:SetHeight(PlayerTalentFrameTalentsClearInfoFrame:GetHeight()-2) + PlayerTalentFrameTalentsClearInfoFrame.icon:SetSize(PlayerTalentFrameTalentsClearInfoFrame:GetSize()) + PlayerTalentFrameTalentsClearInfoFrame:SetPoint('TOPLEFT', PlayerTalentFrameTalents, 'BOTTOMLEFT', 8, -8) for i = 1, 4 do SV.API:Set("Tab", _G["PlayerTalentFrameTab"..i]) if i == 1 then local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() - _G["PlayerTalentFrameTab"..i]:ModPoint(d, e, k, g, -4) + _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) end end hooksecurefunc("PlayerTalentFrame_UpdateTabs", function() for i = 1, 4 do local d, e, k, g = _G["PlayerTalentFrameTab"..i]:GetPoint() - _G["PlayerTalentFrameTab"..i]:ModPoint(d, e, k, g, -4) + _G["PlayerTalentFrameTab"..i]:SetPoint(d, e, k, g, -4) end end) @@ -153,7 +153,7 @@ local function TalentFrameStyle() hooksecurefunc("PlayerTalentFrame_UpdateSpecs", function() local d, x, f, g, h = PlayerSpecTab1:GetPoint() - PlayerSpecTab1:ModPoint(d, x, f, -1, h) + PlayerSpecTab1:SetPoint(d, x, f, -1, h) end) local maxTiers = MAX_TALENT_TIERS @@ -167,8 +167,8 @@ local function TalentFrameStyle() rowFrame:DisableDrawLayer("BORDER") rowFrame:RemoveTextures() - rowFrame.TopLine:ModPoint("TOP", 0, 4) - rowFrame.BottomLine:ModPoint("BOTTOM", 0, -4) + rowFrame.TopLine:SetPoint("TOP", 0, 4) + rowFrame.BottomLine:SetPoint("BOTTOM", 0, -4) for z = 1, NUM_TALENT_COLUMNS do local talentItem = _G[("%sTalent%d"):format(gName, z)] @@ -237,7 +237,7 @@ local function TalentFrameStyle() button.icon:SetTexture(icon) if not button.restyled then button.restyled = true; - button:ModSize(30, 30) + button:SetSize(30, 30) button.ring:Hide() button:SetStyle("!_Frame", "Inset") button.icon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) @@ -268,7 +268,7 @@ local function TalentFrameStyle() button.specIcon:SetTexture(icon) button.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) button.specIcon:SetSize(50, 50) - button.specIcon:ModPoint("LEFT", button, "LEFT", 15, 0) + button.specIcon:SetPoint("LEFT", button, "LEFT", 15, 0) button.SelectedTexture = button:CreateTexture(nil, 'ARTWORK') button.SelectedTexture:SetTexture(1, 1, 0, 0.1) end @@ -315,7 +315,7 @@ local function TalentFrameStyle() A.specIcon:SetTexture(icon) A.specIcon:SetTexCoord(unpack(_G.SVUI_ICON_COORDS)) A.specIcon:SetSize(50, 50) - A.specIcon:ModPoint("LEFT", A, "LEFT", 15, 0) + A.specIcon:SetPoint("LEFT", A, "LEFT", 15, 0) A.SelectedTexture = A:CreateTexture(nil, 'ARTWORK') A.SelectedTexture:SetTexture(1, 1, 0, 0.1) end diff --git a/SVUI_Skins/components/blizzard/timemanager.lua b/SVUI_Skins/components/blizzard/timemanager.lua index bd58c58..17f3f17 100644 --- a/SVUI_Skins/components/blizzard/timemanager.lua +++ b/SVUI_Skins/components/blizzard/timemanager.lua @@ -39,22 +39,22 @@ local function TimeManagerStyle() TimeManagerStopwatchCheck:GetNormalTexture():InsetPoints() local sWatch = TimeManagerStopwatchCheck:CreateTexture(nil, "OVERLAY") sWatch:SetTexture(1, 1, 1, 0.3) - sWatch:ModPoint("TOPLEFT", TimeManagerStopwatchCheck, 2, -2) - sWatch:ModPoint("BOTTOMRIGHT", TimeManagerStopwatchCheck, -2, 2) + sWatch:SetPoint("TOPLEFT", TimeManagerStopwatchCheck, 2, -2) + sWatch:SetPoint("BOTTOMRIGHT", TimeManagerStopwatchCheck, -2, 2) TimeManagerStopwatchCheck:SetHighlightTexture(sWatch) StopwatchFrame:RemoveTextures() StopwatchFrame:SetStyle("Frame", 'Transparent') - StopwatchFrame.Panel:ModPoint("TOPLEFT", 0, -17) - StopwatchFrame.Panel:ModPoint("BOTTOMRIGHT", 0, 2) + StopwatchFrame.Panel:SetPoint("TOPLEFT", 0, -17) + StopwatchFrame.Panel:SetPoint("BOTTOMRIGHT", 0, 2) StopwatchTabFrame:RemoveTextures() SV.API:Set("CloseButton", StopwatchCloseButton) SV.API:Set("PageButton", StopwatchPlayPauseButton) SV.API:Set("PageButton", StopwatchResetButton) - StopwatchPlayPauseButton:ModPoint("RIGHT", StopwatchResetButton, "LEFT", -4, 0) - StopwatchResetButton:ModPoint("BOTTOMRIGHT", StopwatchFrame, "BOTTOMRIGHT", -4, 6) + StopwatchPlayPauseButton:SetPoint("RIGHT", StopwatchResetButton, "LEFT", -4, 0) + StopwatchResetButton:SetPoint("BOTTOMRIGHT", StopwatchFrame, "BOTTOMRIGHT", -4, 6) end --[[ ########################################################## diff --git a/SVUI_Skins/components/blizzard/trade.lua b/SVUI_Skins/components/blizzard/trade.lua index 454356c..f495370 100644 --- a/SVUI_Skins/components/blizzard/trade.lua +++ b/SVUI_Skins/components/blizzard/trade.lua @@ -47,8 +47,8 @@ local function TradeFrameStyle() } for _,frame in pairs(inputs)do _G[frame]:SetStyle("Editbox") - _G[frame].Panel:ModPoint("TOPLEFT", -2, 1) - _G[frame].Panel:ModPoint("BOTTOMRIGHT", -12, -1) + _G[frame].Panel:SetPoint("TOPLEFT", -2, 1) + _G[frame].Panel:SetPoint("BOTTOMRIGHT", -12, -1) _G[frame]:SetTextInsets(-1, -1, -2, -2) end for i = 1, 7 do diff --git a/SVUI_Skins/components/blizzard/tradeskill.lua b/SVUI_Skins/components/blizzard/tradeskill.lua index 0d65372..3cbfd49 100644 --- a/SVUI_Skins/components/blizzard/tradeskill.lua +++ b/SVUI_Skins/components/blizzard/tradeskill.lua @@ -43,11 +43,11 @@ local function TradeSkillStyle() local curWidth,curHeight = TradeSkillFrame:GetSize() local enlargedHeight = curHeight + 170; - TradeSkillFrame:ModSize(curWidth + 30, curHeight + 166) + TradeSkillFrame:SetSize(curWidth + 30, curHeight + 166) SV.API:Set("Window", TradeSkillFrame, true, true) SV.API:Set("Window", TradeSkillGuildFrame) - TradeSkillGuildFrame:ModPoint("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) + TradeSkillGuildFrame:SetPoint("BOTTOMLEFT", TradeSkillFrame, "BOTTOMRIGHT", 3, 19) TradeSkillGuildFrameContainer:RemoveTextures() TradeSkillGuildFrameContainer:SetStyle("Frame", "Inset") SV.API:Set("CloseButton", TradeSkillGuildFrameCloseButton) @@ -55,9 +55,9 @@ local function TradeSkillStyle() TradeSkillRankFrame:SetStyle("Frame", "Bar", true) TradeSkillRankFrame:SetStatusBarTexture(SV.media.statusbar.default) - TradeSkillListScrollFrame:ModSize(327, 290) + TradeSkillListScrollFrame:SetSize(327, 290) TradeSkillListScrollFrame:SetStyle("Frame", "Inset") - TradeSkillDetailScrollFrame:ModSize(327, 180) + TradeSkillDetailScrollFrame:SetSize(327, 180) TradeSkillDetailScrollFrame:SetStyle("Frame", "Inset") TradeSkillCreateButton:SetStyle("Button") @@ -69,8 +69,8 @@ local function TradeSkillStyle() SV.API:Set("ScrollFrame", TradeSkillListScrollFrameScrollBar) SV.API:Set("ScrollFrame", TradeSkillDetailScrollFrameScrollBar) - TradeSkillLinkButton:ModSize(17, 14) - TradeSkillLinkButton:ModPoint("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) + TradeSkillLinkButton:SetSize(17, 14) + TradeSkillLinkButton:SetPoint("LEFT", TradeSkillLinkFrame, "LEFT", 5, -1) TradeSkillLinkButton:SetStyle("Button") TradeSkillLinkButton:GetNormalTexture():SetTexCoord(0.25, 0.7, 0.45, 0.8) @@ -80,7 +80,7 @@ local function TradeSkillStyle() SV.API:Set("PageButton", TradeSkillDecrementButton) SV.API:Set("PageButton", TradeSkillIncrementButton) - TradeSkillIncrementButton:ModPoint("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) + TradeSkillIncrementButton:SetPoint("RIGHT", TradeSkillCreateButton, "LEFT", -13, 0) SV.API:Set("CloseButton", TradeSkillFrameCloseButton) local internalTest = false; @@ -114,7 +114,7 @@ local function TradeSkillStyle() if i > 2 and internalTest == false then local d, a3, f, g, h = u:GetPoint() u:ClearAllPoints() - u:ModPoint(d, a3, f, g, h-3) + u:SetPoint(d, a3, f, g, h-3) internalTest = true end _G["TradeSkillReagent"..i.."NameFrame"]:Die() diff --git a/SVUI_Skins/components/blizzard/transmog.lua b/SVUI_Skins/components/blizzard/transmog.lua index 84ebce3..67fe3b9 100644 --- a/SVUI_Skins/components/blizzard/transmog.lua +++ b/SVUI_Skins/components/blizzard/transmog.lua @@ -50,7 +50,7 @@ TRANSMOG MODR local function TransmogStyle() if SV.db.Skins.blizzard.enable ~= true or SV.db.Skins.blizzard.transmogrify ~= true then return end - TransmogrifyFrame:ModSize(500, 600) + TransmogrifyFrame:SetSize(500, 600) SV.API:Set("Window", TransmogrifyFrame, true) for p, texture in pairs(TransmogFrameList)do @@ -60,14 +60,14 @@ local function TransmogStyle() select(2, TransmogrifyModelFrame:GetRegions()):Die() TransmogrifyModelFrame:ClearAllPoints() - TransmogrifyModelFrame:ModPoint("TOPLEFT", TransmogrifyFrame, "TOPLEFT", 12, -22) - TransmogrifyModelFrame:ModPoint("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -12, 36) + TransmogrifyModelFrame:SetPoint("TOPLEFT", TransmogrifyFrame, "TOPLEFT", 12, -22) + TransmogrifyModelFrame:SetPoint("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -12, 36) TransmogrifyModelFrame:SetStyle("!_Frame", "Model") TransmogrifyFrameButtonFrame:GetRegions():Die() TransmogrifyApplyButton:RemoveTextures() TransmogrifyApplyButton:SetStyle("Button") - TransmogrifyApplyButton:ModPoint("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -4, 4) + TransmogrifyApplyButton:SetPoint("BOTTOMRIGHT", TransmogrifyFrame, "BOTTOMRIGHT", -4, 4) SV.API:Set("CloseButton", TransmogrifyArtFrameCloseButton) TransmogrifyArtFrame:RemoveTextures() diff --git a/SVUI_Skins/components/blizzard/voidstorage.lua b/SVUI_Skins/components/blizzard/voidstorage.lua index 5acad6d..a451554 100644 --- a/SVUI_Skins/components/blizzard/voidstorage.lua +++ b/SVUI_Skins/components/blizzard/voidstorage.lua @@ -63,7 +63,7 @@ local function ChangeTabHelper(this) this:SetScript("OnLeave", Tab_OnLeave) local a,b,c,d,e = this:GetPoint() - this:ModPoint(a,b,c,1,e) + this:SetPoint(a,b,c,1,e) end local SlotBorderColor_Hook = function(self, ...) @@ -133,8 +133,8 @@ local function VoidStorageStyle() SV.API:Set("CloseButton", VoidStorageBorderFrame.CloseButton) VoidItemSearchBox:SetStyle("Frame", "Inset") - VoidItemSearchBox.Panel:ModPoint("TOPLEFT", 10, -1) - VoidItemSearchBox.Panel:ModPoint("BOTTOMRIGHT", 4, 1) + VoidItemSearchBox.Panel:SetPoint("TOPLEFT", 10, -1) + VoidItemSearchBox.Panel:SetPoint("BOTTOMRIGHT", 4, 1) for i = 1, 9 do VoidSlotStyler("VoidStorageDeposit", i) diff --git a/SVUI_Skins/components/blizzard/worldmap.lua b/SVUI_Skins/components/blizzard/worldmap.lua index e2c271b..f2dbb65 100644 --- a/SVUI_Skins/components/blizzard/worldmap.lua +++ b/SVUI_Skins/components/blizzard/worldmap.lua @@ -45,8 +45,8 @@ local function WorldMap_FullView() -- WorldMapFrame:SetPoint("TOP", SV.Screen, "TOP", 0, 0) WorldMapFrame.Panel:ClearAllPoints() local w, h = WorldMapDetailFrame:GetSize() - WorldMapFrame.Panel:ModSize(w + 24, h + 98) - WorldMapFrame.Panel:ModPoint("TOP", WorldMapFrame, "TOP", 0, 0) + WorldMapFrame.Panel:SetSize(w + 24, h + 98) + WorldMapFrame.Panel:SetPoint("TOP", WorldMapFrame, "TOP", 0, 0) --WorldMapFrame.Panel.Panel:WrapPoints(WorldMapFrame.Panel) if(SVUI_WorldMapCoords) then SVUI_WorldMapCoords:SetPoint("BOTTOMLEFT", WorldMapFrame.Panel, "BOTTOMLEFT", 5, 5) @@ -97,9 +97,9 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame:SetWidth(detailWidth) WorldMapFrameNavBar:ClearAllPoints() - WorldMapFrameNavBar:ModPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) + WorldMapFrameNavBar:SetPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) WorldMapFrameTutorialButton:ClearAllPoints() - WorldMapFrameTutorialButton:ModPoint("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) + WorldMapFrameTutorialButton:SetPoint("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) end local function WorldMap_OnShow() @@ -166,12 +166,12 @@ local function WorldMapStyle() BlackoutWorld:SetParent(WorldMapFrame.Panel) WorldMapFrameNavBar:ClearAllPoints() - WorldMapFrameNavBar:ModPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) + WorldMapFrameNavBar:SetPoint("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) WorldMapFrameNavBar:SetStyle("Frame", "Inset", true, 2, 2, 1) WorldMapFrameTutorialButton:Die() --SV.API:Set("InfoButton", WorldMapFrameTutorialButton) - --WorldMapFrameTutorialButton:ModPoint("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) + --WorldMapFrameTutorialButton:SetPoint("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) WorldMap_OnShow() end diff --git a/SVUI_Tooltip/Loader.lua b/SVUI_Tooltip/Loader.lua index a8b60e6..57befc5 100644 --- a/SVUI_Tooltip/Loader.lua +++ b/SVUI_Tooltip/Loader.lua @@ -174,7 +174,7 @@ function MOD:LoadOptions() max = 15, step = 1, width = "full", - set = function(a,b)SV.db[Schema].healthBar.height = b;GameTooltipStatusBar:ModHeight(b)end + set = function(a,b)SV.db[Schema].healthBar.height = b;GameTooltipStatusBar:SetHeight(b)end }, } } diff --git a/SVUI_Tooltip/SVUI_Tooltip.lua b/SVUI_Tooltip/SVUI_Tooltip.lua index 8f467b0..5c345e4 100644 --- a/SVUI_Tooltip/SVUI_Tooltip.lua +++ b/SVUI_Tooltip/SVUI_Tooltip.lua @@ -700,7 +700,7 @@ MOD.GameTooltip_SetDefaultAnchor = _hook_GameTooltip_SetDefaultAnchor local _hook_BNToastOnShow = function(self,anchor,parent,relative,x,y) if parent ~= BattleNetToasts_MOVE then BNToastFrame:ClearAllPoints() - BNToastFrame:ModPoint('TOPLEFT',BattleNetToasts_MOVE,'TOPLEFT') + BNToastFrame:SetPoint('TOPLEFT',BattleNetToasts_MOVE,'TOPLEFT') end end @@ -892,8 +892,8 @@ end function MOD:Load() self:UpdateLocals() - self.Holder:ModPoint("BOTTOMLEFT", SV.Dock.BottomRight, "TOPLEFT", 0, 56) - self.Holder:ModSize(130, 20) + self.Holder:SetPoint("BOTTOMLEFT", SV.Dock.BottomRight, "TOPLEFT", 0, 56) + self.Holder:SetSize(130, 20) self.Holder:SetFrameLevel(self.Holder:GetFrameLevel() + 50) SV:NewAnchor(self.Holder, L["Tooltip"]) @@ -901,7 +901,7 @@ function MOD:Load() GameTooltipStatusBar:SetStatusBarTexture(SV.media.statusbar.default) BNToastFrame:ClearAllPoints() - BNToastFrame:ModPoint("BOTTOMRIGHT", SV.Dock.BottomLeft, "TOPRIGHT", 0, 20) + BNToastFrame:SetPoint("BOTTOMRIGHT", SV.Dock.BottomLeft, "TOPRIGHT", 0, 20) SV:NewAnchor(BNToastFrame, L["BattleNet Frame"], nil, nil, "BattleNetToasts") NewHook(BNToastFrame, "SetPoint", _hook_BNToastOnShow) @@ -911,7 +911,7 @@ function MOD:Load() GameTooltipStatusBar:SetPoint("BOTTOMLEFT", GameTooltip.SuperBorder, "BOTTOMLEFT", 3, 3) GameTooltipStatusBar:SetPoint("BOTTOMRIGHT", GameTooltip.SuperBorder, "BOTTOMRIGHT", -3, 3) GameTooltipStatusBar.text = GameTooltipStatusBar:CreateFontString(nil, "OVERLAY") - GameTooltipStatusBar.text:ModPoint("CENTER", GameTooltipStatusBar, "CENTER", 0, 0) + GameTooltipStatusBar.text:SetPoint("CENTER", GameTooltipStatusBar, "CENTER", 0, 0) GameTooltipStatusBar.text:SetFontObject(SVUI_Font_Default) diff --git a/SVUI_TrackOMatic/components/unitframe_gps.lua b/SVUI_TrackOMatic/components/unitframe_gps.lua index 5b74f19..883cf85 100644 --- a/SVUI_TrackOMatic/components/unitframe_gps.lua +++ b/SVUI_TrackOMatic/components/unitframe_gps.lua @@ -128,13 +128,13 @@ local function CreateGPS(frame) local gps = CreateFrame("Frame", nil, frame.TextGrip) gps:SetFrameLevel(99) - gps:ModSize(size, size) + gps:SetSize(size, size) gps.DefaultSize = size - gps:ModPoint("RIGHT", frame, "RIGHT", 0, 0) + gps:SetPoint("RIGHT", frame, "RIGHT", 0, 0) gps.Arrow = gps:CreateTexture(nil, "OVERLAY", nil, 7) gps.Arrow:SetTexture([[Interface\AddOns\SVUI_TrackOMatic\artwork\GPS-ARROW]]) - gps.Arrow:ModSize(size, size) + gps.Arrow:SetSize(size, size) gps.Arrow:SetPoint("CENTER", gps, "CENTER", 0, 0) gps.Arrow:SetVertexColor(0.1, 0.8, 0.8) gps.Arrow:SetBlendMode("ADD") diff --git a/SVUI_UnitFrames/SVUI_UnitFrames.lua b/SVUI_UnitFrames/SVUI_UnitFrames.lua index 50cc8a7..32677fb 100644 --- a/SVUI_UnitFrames/SVUI_UnitFrames.lua +++ b/SVUI_UnitFrames/SVUI_UnitFrames.lua @@ -452,12 +452,12 @@ function MOD:RefreshUnitLayout(frame, template) local DEBUFF_ENABLED = (db.debuffs and db.debuffs.enable) or false; if(RESIZE_NEEDED) then - frame:ModSize(UNIT_WIDTH + (MASTER_X1_OFFSET + MASTER_X2_OFFSET), UNIT_HEIGHT + (MASTER_TOP_OFFSET + MASTER_BOTTOM_OFFSET)) + frame:SetSize(UNIT_WIDTH + (MASTER_X1_OFFSET + MASTER_X2_OFFSET), UNIT_HEIGHT + (MASTER_TOP_OFFSET + MASTER_BOTTOM_OFFSET)) end MASTER_GRIP:ClearAllPoints(); - MASTER_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, ((MASTER_X1_OFFSET + PORTRAIT_WIDTH) * TOP_MODIFIER), MASTER_TOP_OFFSET); - MASTER_GRIP:ModPoint(BOTTOM_ANCHOR2, frame, BOTTOM_ANCHOR2, (MASTER_X2_OFFSET * BOTTOM_MODIFIER), MASTER_BOTTOM_OFFSET); + MASTER_GRIP:SetPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, ((MASTER_X1_OFFSET + PORTRAIT_WIDTH) * TOP_MODIFIER), MASTER_TOP_OFFSET); + MASTER_GRIP:SetPoint(BOTTOM_ANCHOR2, frame, BOTTOM_ANCHOR2, (MASTER_X2_OFFSET * BOTTOM_MODIFIER), MASTER_BOTTOM_OFFSET); if(frame.StatusPanel) then if(template ~= "player" and template ~= "pet" and template ~= "target" and template ~= "targettarget" and template ~= "focus" and template ~= "focustarget") then @@ -497,10 +497,10 @@ function MOD:RefreshUnitLayout(frame, template) if frame.TargetGlow then local glow = frame.TargetGlow; glow:ClearAllPoints() - glow:ModPoint("TOPLEFT", -3, 3) - glow:ModPoint("TOPRIGHT", 3, 3) - glow:ModPoint("BOTTOMLEFT", -3, -3) - glow:ModPoint("BOTTOMRIGHT", 3, -3) + glow:SetPoint("TOPLEFT", -3, 3) + glow:SetPoint("TOPRIGHT", 3, 3) + glow:SetPoint("BOTTOMLEFT", -3, -3) + glow:SetPoint("BOTTOMRIGHT", 3, -3) end --[[ INFO TEXTS ]]-- @@ -510,7 +510,7 @@ function MOD:RefreshUnitLayout(frame, template) local nametext = TEXT_GRIP.Name if(GRID_MODE) then nametext:ClearAllPoints() - nametext:ModPoint("CENTER", frame, "CENTER", 0, 0) + nametext:SetPoint("CENTER", frame, "CENTER", 0, 0) nametext:SetJustifyH("CENTER") nametext:SetJustifyV("MIDDLE") if(db.name.tags ~= nil and db.name.tags ~= '') then @@ -661,11 +661,11 @@ function MOD:RefreshUnitLayout(frame, template) if(db.power and POWER_POINT) then local a1,a2,ax,ay,b1,b2,bx,by = unpack(POWER_POINT) - POWER_GRIP:ModPoint(a1, MASTER_GRIP, a2, ax, ay) + POWER_GRIP:SetPoint(a1, MASTER_GRIP, a2, ax, ay) if(b1) then - POWER_GRIP:ModPoint(b1, MASTER_GRIP, b2, bx, by) + POWER_GRIP:SetPoint(b1, MASTER_GRIP, b2, bx, by) end - POWER_GRIP:ModSize((POWER_WIDTH - 2), (POWER_HEIGHT - 2)) + POWER_GRIP:SetSize((POWER_WIDTH - 2), (POWER_HEIGHT - 2)) POWER_GRIP.Panel:ClearAllPoints() if(POWER_DETACHED) then @@ -673,20 +673,20 @@ function MOD:RefreshUnitLayout(frame, template) if(frame.InfoPanel) then frame.InfoPanel:ClearAllPoints() if(db.power.anchor == "BOTTOM") then - frame.InfoPanel:ModPoint("TOPLEFT", POWER_GRIP, "BOTTOMLEFT", 0, 1) - frame.InfoPanel:ModPoint("TOPRIGHT", POWER_GRIP, "BOTTOMRIGHT", 0, 1) + frame.InfoPanel:SetPoint("TOPLEFT", POWER_GRIP, "BOTTOMLEFT", 0, 1) + frame.InfoPanel:SetPoint("TOPRIGHT", POWER_GRIP, "BOTTOMRIGHT", 0, 1) else - frame.InfoPanel:ModPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) - frame.InfoPanel:ModPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) + frame.InfoPanel:SetPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) + frame.InfoPanel:SetPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) end end else POWER_GRIP.Panel:WrapPoints(POWER_GRIP) end else - POWER_GRIP:ModHeight(POWER_HEIGHT - 2) - POWER_GRIP:ModPoint(BOTTOM_ANCHOR1, MASTER_GRIP, BOTTOM_ANCHOR1, (1 * TOP_MODIFIER), 1) - POWER_GRIP:ModPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR2, (1 * BOTTOM_MODIFIER), 1) + POWER_GRIP:SetHeight(POWER_HEIGHT - 2) + POWER_GRIP:SetPoint(BOTTOM_ANCHOR1, MASTER_GRIP, BOTTOM_ANCHOR1, (1 * TOP_MODIFIER), 1) + POWER_GRIP:SetPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR2, (1 * BOTTOM_MODIFIER), 1) end if(db.power and db.power.orientation) then @@ -705,13 +705,13 @@ function MOD:RefreshUnitLayout(frame, template) if(db.power.enable) then local Alt_OnShow = function() if(not POWER_DETACHED) then - MASTER_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -(POWER_HEIGHT + 1)) + MASTER_GRIP:SetPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -(POWER_HEIGHT + 1)) end end local Alt_OnHide = function() if(not POWER_DETACHED) then - MASTER_GRIP:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -1) + MASTER_GRIP:SetPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -1) end altPower.text:SetText("") end @@ -721,8 +721,8 @@ function MOD:RefreshUnitLayout(frame, template) altPower.text:SetFont(TEXT_GRIP.Health:GetFont()) end altPower.text:SetAlpha(1) - altPower:ModPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -1) - altPower:ModPoint(TOP_ANCHOR1, frame, TOP_ANCHOR1, (1 * BOTTOM_MODIFIER), -1) + altPower:SetPoint(TOP_ANCHOR2, frame, TOP_ANCHOR2, PORTRAIT_WIDTH, -1) + altPower:SetPoint(TOP_ANCHOR1, frame, TOP_ANCHOR1, (1 * BOTTOM_MODIFIER), -1) altPower:SetHeight(POWER_HEIGHT) altPower.Smooth = SV.db.UnitFrames.smoothbars; altPower:HookScript("OnShow", Alt_OnShow) @@ -751,9 +751,9 @@ function MOD:RefreshUnitLayout(frame, template) PORTRAIT_GRIP:InsetPoints(MASTER_GRIP,2,2) PORTRAIT_GRIP.Outline:Hide() else - PORTRAIT_GRIP:ModPoint(TOP_ANCHOR1, MASTER_GRIP, TOP_ANCHOR2, 0, -2) - PORTRAIT_GRIP:ModPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR1, 0, 2) - PORTRAIT_GRIP:ModWidth(PORTRAIT_WIDTH) + PORTRAIT_GRIP:SetPoint(TOP_ANCHOR1, MASTER_GRIP, TOP_ANCHOR2, 0, -2) + PORTRAIT_GRIP:SetPoint(BOTTOM_ANCHOR2, MASTER_GRIP, BOTTOM_ANCHOR1, 0, 2) + PORTRAIT_GRIP:SetWidth(PORTRAIT_WIDTH) PORTRAIT_GRIP.Outline:Show() end @@ -1025,7 +1025,7 @@ function MOD:RefreshUnitLayout(frame, template) classIcon:ClearAllPoints() classIcon:SetAlpha(1) - classIcon:ModSize(size) + classIcon:SetSize(size) SV:SetReversePoint(classIcon, ico.classIcon.attachTo, MASTER_GRIP, ico.classIcon.xOffset, ico.classIcon.yOffset) else classIcon:Hide() @@ -1044,11 +1044,11 @@ function MOD:RefreshUnitLayout(frame, template) if(GRID_MODE) then raidIcon:SetAlpha(0.7) - raidIcon:ModSize(10) - raidIcon:ModPoint("TOP", MASTER_GRIP, "TOP", 0, 0) + raidIcon:SetSize(10) + raidIcon:SetPoint("TOP", MASTER_GRIP, "TOP", 0, 0) else raidIcon:SetAlpha(1) - raidIcon:ModSize(size) + raidIcon:SetSize(size) SV:SetReversePoint(raidIcon, ico.raidicon.attachTo, MASTER_GRIP, ico.raidicon.xOffset, ico.raidicon.yOffset) end else @@ -1069,11 +1069,11 @@ function MOD:RefreshUnitLayout(frame, template) if(GRID_MODE) then lfd:SetAlpha(0.7) - lfd:ModSize(10) - lfd:ModPoint("BOTTOM", MASTER_GRIP, "BOTTOM", 0, 0) + lfd:SetSize(10) + lfd:SetPoint("BOTTOM", MASTER_GRIP, "BOTTOM", 0, 0) else lfd:SetAlpha(1) - lfd:ModSize(size) + lfd:SetSize(size) SV:SetReversePoint(lfd, ico.roleIcon.attachTo, MASTER_GRIP, ico.roleIcon.xOffset, ico.roleIcon.yOffset) end else @@ -1095,11 +1095,11 @@ function MOD:RefreshUnitLayout(frame, template) if(GRID_MODE) then roles:SetAlpha(0.7) - roles:ModSize(10) - roles:ModPoint("CENTER", MASTER_GRIP, "TOPLEFT", 0, 2) + roles:SetSize(10) + roles:SetPoint("CENTER", MASTER_GRIP, "TOPLEFT", 0, 2) else roles:SetAlpha(1) - roles:ModSize(size) + roles:SetSize(size) SV:SetReversePoint(roles, ico.raidRoleIcons.attachTo, MASTER_GRIP, ico.raidRoleIcons.xOffset, ico.raidRoleIcons.yOffset) end else diff --git a/SVUI_UnitFrames/bodyguard.lua b/SVUI_UnitFrames/bodyguard.lua index 4cc786f..e561348 100644 --- a/SVUI_UnitFrames/bodyguard.lua +++ b/SVUI_UnitFrames/bodyguard.lua @@ -372,7 +372,7 @@ end function MOD:InitializeBodyGuard() BodyGuard.UF.VisualState = "Hide" - BodyGuard.UF:ModPoint("BOTTOMRIGHT", SV.Dock.BottomLeft, "TOPRIGHT", 0, 10) + BodyGuard.UF:SetPoint("BOTTOMRIGHT", SV.Dock.BottomLeft, "TOPRIGHT", 0, 10) BodyGuard.UF:SetWidth(SV.db.UnitFrames.bodyguard.width) BodyGuard.UF:SetHeight(SV.db.UnitFrames.bodyguard.height) BodyGuard.UF:SetScript("OnEvent", function(self, event) diff --git a/SVUI_UnitFrames/class_resources/deathknight.lua b/SVUI_UnitFrames/class_resources/deathknight.lua index 868d57d..46e32fd 100644 --- a/SVUI_UnitFrames/class_resources/deathknight.lua +++ b/SVUI_UnitFrames/class_resources/deathknight.lua @@ -77,7 +77,7 @@ local Reposition = function(self) local inset = size * 0.1 local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -96,7 +96,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 1) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -6, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -6, 0) end bar[i].bar:ClearAllPoints() bar[i].bar:InsetPoints(bgFrame,inset,inset) @@ -161,7 +161,7 @@ function MOD:CreateClassBar(playerFrame) end local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/druid.lua b/SVUI_UnitFrames/class_resources/druid.lua index 861f776..06d18c8 100644 --- a/SVUI_UnitFrames/class_resources/druid.lua +++ b/SVUI_UnitFrames/class_resources/druid.lua @@ -106,7 +106,7 @@ local Reposition = function(self) local scaled = (height * 0.8) local width = db.width * 0.4; - bar.Holder:ModSize(width, height) + bar.Holder:SetSize(width, height) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -121,21 +121,21 @@ local Reposition = function(self) chicken:ClearAllPoints() chicken:SetAllPoints() - chicken.LunarBar:ModSize(width, adjustedBar) + chicken.LunarBar:SetSize(width, adjustedBar) chicken.LunarBar:SetMinMaxValues(0,0) chicken.LunarBar:SetStatusBarColor(.13,.32,1) - chicken.Moon:ModSize(height, height) - chicken.Moon[1]:ModSize(adjustedAnim, adjustedAnim) - chicken.Moon[2]:ModSize(scaled, scaled) + chicken.Moon:SetSize(height, height) + chicken.Moon[1]:SetSize(adjustedAnim, adjustedAnim) + chicken.Moon[2]:SetSize(scaled, scaled) - chicken.SolarBar:ModSize(width, adjustedBar) + chicken.SolarBar:SetSize(width, adjustedBar) chicken.SolarBar:SetMinMaxValues(0,0) chicken.SolarBar:SetStatusBarColor(1,1,0.21) - chicken.Sun:ModSize(height, height) - chicken.Sun[1]:ModSize(adjustedAnim, adjustedAnim) - chicken.Sun[2]:ModSize(scaled, scaled) + chicken.Sun:SetSize(height, height) + chicken.Sun[1]:SetSize(adjustedAnim, adjustedAnim) + chicken.Sun[2]:SetSize(scaled, scaled) chicken.Text:SetPoint("TOPLEFT", chicken, "TOPLEFT", 10, 0) chicken.Text:SetPoint("BOTTOMRIGHT", chicken, "BOTTOMRIGHT", -10, 0) @@ -146,13 +146,13 @@ local Reposition = function(self) local size = (height - 4) for i = 1, max do cat[i]:ClearAllPoints() - cat[i]:ModSize(size, size) + cat[i]:SetSize(size, size) cat[i].Icon:ClearAllPoints() cat[i].Icon:SetAllPoints(cat[i]) if i==1 then cat[i]:SetPoint("LEFT", cat) else - cat[i]:ModPoint("LEFT", cat[i - 1], "RIGHT", -2, 0) + cat[i]:SetPoint("LEFT", cat[i - 1], "RIGHT", -2, 0) end end end @@ -164,18 +164,18 @@ DRUID ECLIPSE BAR function MOD:CreateClassBar(playerFrame) local bar = CreateFrame('Frame', nil, playerFrame) bar:SetFrameLevel(playerFrame.TextGrip:GetFrameLevel() + 30) - bar:ModSize(100,40) + bar:SetSize(100,40) local chicken = CreateFrame('Frame', nil, bar) chicken:SetAllPoints(bar) local moon = CreateFrame('Frame', nil, chicken) moon:SetFrameLevel(chicken:GetFrameLevel() + 2) - moon:ModSize(40, 40) + moon:SetSize(40, 40) moon:SetPoint("TOPLEFT", chicken, "TOPLEFT", 0, 0) moon[1] = moon:CreateTexture(nil, "BACKGROUND", nil, 1) - moon[1]:ModSize(40, 40) + moon[1]:SetSize(40, 40) moon[1]:SetPoint("CENTER") moon[1]:SetTexture("Interface\\AddOns\\SVUI_UnitFrames\\assets\\Class\\VORTEX") moon[1]:SetBlendMode("ADD") @@ -183,7 +183,7 @@ function MOD:CreateClassBar(playerFrame) SV.Animate:Orbit(moon[1], 10, false) moon[2] = moon:CreateTexture(nil, "OVERLAY", nil, 2) - moon[2]:ModSize(30, 30) + moon[2]:SetSize(30, 30) moon[2]:SetPoint("CENTER") moon[2]:SetTexture("Interface\\AddOns\\SVUI_UnitFrames\\assets\\Class\\DRUID-MOON") moon[1]:Hide() @@ -191,24 +191,24 @@ function MOD:CreateClassBar(playerFrame) local lunar = CreateFrame('StatusBar', nil, chicken) lunar:SetPoint("LEFT", moon, "RIGHT", -10, 0) - lunar:ModSize(100,40) + lunar:SetSize(100,40) lunar:SetStatusBarTexture(SV.media.statusbar.lazer) lunar.noupdate = true; chicken.LunarBar = lunar; local solar = CreateFrame('StatusBar', nil, chicken) solar:SetPoint('LEFT', lunar:GetStatusBarTexture(), 'RIGHT') - solar:ModSize(100,40) + solar:SetSize(100,40) solar:SetStatusBarTexture(SV.media.statusbar.lazer) solar.noupdate = true; chicken.SolarBar = solar; local sun = CreateFrame('Frame', nil, chicken) sun:SetFrameLevel(chicken:GetFrameLevel() + 2) - sun:ModSize(40, 40) + sun:SetSize(40, 40) sun:SetPoint("LEFT", lunar, "RIGHT", -10, 0) sun[1] = sun:CreateTexture(nil, "BACKGROUND", nil, 1) - sun[1]:ModSize(40, 40) + sun[1]:SetSize(40, 40) sun[1]:SetPoint("CENTER") sun[1]:SetTexture("Interface\\AddOns\\SVUI_UnitFrames\\assets\\Class\\VORTEX") sun[1]:SetBlendMode("ADD") @@ -216,7 +216,7 @@ function MOD:CreateClassBar(playerFrame) SV.Animate:Orbit(sun[1], 10, false) sun[2] = sun:CreateTexture(nil, "OVERLAY", nil, 2) - sun[2]:ModSize(30, 30) + sun[2]:SetSize(30, 30) sun[2]:SetPoint("CENTER") sun[2]:SetTexture("Interface\\AddOns\\SVUI_UnitFrames\\assets\\Class\\DRUID-SUN") sun[1]:Hide() @@ -259,10 +259,10 @@ function MOD:CreateClassBar(playerFrame) local max = MAX_COMBO_POINTS; for i = 1, max do local cpoint = CreateFrame('Frame',nil,cat) - cpoint:ModSize(size,size) + cpoint:SetSize(size,size) local icon = cpoint:CreateTexture(nil,"OVERLAY",nil,1) - icon:ModSize(size,size) + icon:SetSize(size,size) icon:SetPoint("CENTER") icon:SetBlendMode("BLEND") icon:SetTexture(comboTextures[random(1,3)]) @@ -297,7 +297,7 @@ function MOD:CreateClassBar(playerFrame) bar.Mana = mana; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/hunter.lua b/SVUI_UnitFrames/class_resources/hunter.lua index 2d7b582..f1fb296 100644 --- a/SVUI_UnitFrames/class_resources/hunter.lua +++ b/SVUI_UnitFrames/class_resources/hunter.lua @@ -50,7 +50,7 @@ local Reposition = function(self) local max = self.MaxClassPower; local size = db.classbar.height + 10 local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -68,7 +68,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) end end end @@ -137,7 +137,7 @@ function MOD:CreateClassBar(playerFrame) bar[3].Update = SnakeTrapUpdate local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/mage.lua b/SVUI_UnitFrames/class_resources/mage.lua index 66b00fa..b57e114 100644 --- a/SVUI_UnitFrames/class_resources/mage.lua +++ b/SVUI_UnitFrames/class_resources/mage.lua @@ -63,7 +63,7 @@ local Reposition = function(self) local max = self.MaxClassPower; local size = db.classbar.height local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -81,7 +81,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -3, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -3, 0) end end end @@ -192,7 +192,7 @@ function MOD:CreateClassBar(playerFrame) bar.PostTalentUpdate = PostTalentUpdate; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/monk.lua b/SVUI_UnitFrames/class_resources/monk.lua index 84c68f5..6178e2a 100644 --- a/SVUI_UnitFrames/class_resources/monk.lua +++ b/SVUI_UnitFrames/class_resources/monk.lua @@ -68,7 +68,7 @@ local Reposition = function(self) local max = self.MaxClassPower; local size = db.classbar.height local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -89,7 +89,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -2, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -2, 0) end end end @@ -135,8 +135,8 @@ function MOD:CreateClassBar(playerFrame) end local stagger = CreateFrame("Statusbar",nil,playerFrame) - stagger:ModPoint('TOPLEFT', playerFrame, 'TOPRIGHT', 3, 0) - stagger:ModPoint('BOTTOMLEFT', playerFrame, 'BOTTOMRIGHT', 3, 0) + stagger:SetPoint('TOPLEFT', playerFrame, 'TOPRIGHT', 3, 0) + stagger:SetPoint('BOTTOMLEFT', playerFrame, 'BOTTOMRIGHT', 3, 0) stagger:SetWidth(10) stagger:SetStyle("Frame", "Bar") stagger:SetOrientation("VERTICAL") @@ -160,7 +160,7 @@ function MOD:CreateClassBar(playerFrame) bar.DrunkenMaster = stagger local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/paladin.lua b/SVUI_UnitFrames/class_resources/paladin.lua index f50ef14..87736bb 100644 --- a/SVUI_UnitFrames/class_resources/paladin.lua +++ b/SVUI_UnitFrames/class_resources/paladin.lua @@ -60,7 +60,7 @@ local Reposition = function(self) local max = self.MaxClassPower; local size = db.classbar.height + 4; local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -79,7 +79,7 @@ local Reposition = function(self) if i==1 then bar[i].holder:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i].holder:ModPoint("LEFT", bar[i - 1].holder, "RIGHT", -4, 0) + bar[i].holder:SetPoint("LEFT", bar[i - 1].holder, "RIGHT", -4, 0) end end end @@ -145,7 +145,7 @@ function MOD:CreateClassBar(playerFrame) bar.Override = Update; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/priest.lua b/SVUI_UnitFrames/class_resources/priest.lua index e8c527a..4182a01 100644 --- a/SVUI_UnitFrames/class_resources/priest.lua +++ b/SVUI_UnitFrames/class_resources/priest.lua @@ -57,7 +57,7 @@ local Reposition = function(self) local size = db.classbar.height local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -76,7 +76,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) end end end @@ -116,7 +116,7 @@ function MOD:CreateClassBar(playerFrame) bar.PreUpdate = PreUpdate local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/rogue.lua b/SVUI_UnitFrames/class_resources/rogue.lua index dc1633f..a1d74ca 100644 --- a/SVUI_UnitFrames/class_resources/rogue.lua +++ b/SVUI_UnitFrames/class_resources/rogue.lua @@ -1,7 +1,7 @@ --[[ ########################################################## S V U I By: Munglunch -########################################################## +########################################################## LOCALIZED LUA FUNCTIONS ########################################################## ]]-- @@ -20,8 +20,8 @@ local assert = _G.assert; local math = _G.math; --[[ MATH METHODS ]]-- local random = math.random; ---[[ -########################################################## +--[[ +########################################################## GET ADDON DATA ########################################################## ]]-- @@ -30,21 +30,21 @@ local L = SV.L; local LSM = _G.LibStub("LibSharedMedia-3.0") local MOD = SV.UnitFrames -if(not MOD) then return end +if(not MOD) then return end local oUF_SVUI = MOD.oUF assert(oUF_SVUI, "SVUI UnitFrames: unable to locate oUF.") -if(SV.class ~= "ROGUE") then return end ---[[ -########################################################## +if(SV.class ~= "ROGUE") then return end +--[[ +########################################################## LOCALS ########################################################## ]]-- local TRACKER_FONT = [[Interface\AddOns\SVUI_!Core\assets\fonts\Combo.ttf]] local ICON_BG = [[Interface\Addons\SVUI_UnitFrames\assets\Class\ROGUE-SMOKE]]; local ICON_ANTI = [[Interface\Addons\SVUI_UnitFrames\assets\Class\ROGUE-ANTICIPATION]]; ---[[ -########################################################## +--[[ +########################################################## POSITIONING ########################################################## ]]-- @@ -59,31 +59,34 @@ local Reposition = function(self) local height = db.classbar.height local width = height * 3; local textwidth = height * 1.25; - bar.Holder:ModSize(width, height) - if(not db.classbar.detachFromFrame) then - SV:ResetAnchors(L["Classbar"]) - end - local holderUpdate = bar.Holder:GetScript('OnSizeChanged') - if holderUpdate then - holderUpdate(bar.Holder) - end - - bar:ClearAllPoints() - bar:SetAllPoints(bar.Holder) - - local points = bar.Combo; + + bar.Holder:SetSize(width, height) + + if(not db.classbar.detachFromFrame) then + SV:ResetAnchors(L["Classbar"]) + end + + local holderUpdate = bar.Holder:GetScript('OnSizeChanged') + if holderUpdate then + holderUpdate(bar.Holder) + end + + bar:ClearAllPoints() + bar:SetAllPoints(bar.Holder) + + local points = bar.Combo; local max = MAX_COMBO_POINTS; local size = height + 4 points:ClearAllPoints() points:SetAllPoints(bar) for i = 1, max do points[i]:ClearAllPoints() - points[i]:ModSize(size, size) + points[i]:SetSize(size, size) - if i==1 then + if i==1 then points[i]:SetPoint("LEFT", points) - else - points[i]:ModPoint("LEFT", points[i - 1], "RIGHT", -8, 0) + else + points[i]:SetPoint("LEFT", points[i - 1], "RIGHT", -8, 0) end end @@ -91,8 +94,8 @@ local Reposition = function(self) bar.Guile:SetFont(TRACKER_FONT, height, 'OUTLINE') end end ---[[ -########################################################## +--[[ +########################################################## ROGUE COMBO TRACKER ########################################################## ]]-- @@ -105,9 +108,9 @@ function MOD:CreateClassBar(playerFrame) bar:SetFrameLevel(playerFrame.TextGrip:GetFrameLevel() + 30) bar.Combo = CreateFrame("Frame",nil,bar) - for i = 1, max do + for i = 1, max do local cpoint = CreateFrame('Frame', nil, bar.Combo) - cpoint:ModSize(size,size) + cpoint:SetSize(size,size) SV.SpecialFX:SetFXFrame(cpoint, "default") @@ -128,8 +131,8 @@ function MOD:CreateClassBar(playerFrame) anti:Hide() cpoint.Anticipation = anti - bar.Combo[i] = cpoint - end + bar.Combo[i] = cpoint + end local guile = bar:CreateFontString(nil, 'OVERLAY', nil, 7) guile:SetPoint("RIGHT", bar, "LEFT", 0, -3) @@ -139,7 +142,7 @@ function MOD:CreateClassBar(playerFrame) bar.Guile = guile; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) @@ -147,5 +150,5 @@ function MOD:CreateClassBar(playerFrame) playerFrame.MaxClassPower = 5; playerFrame.RefreshClassBar = Reposition; playerFrame.HyperCombo = bar - return 'HyperCombo' -end \ No newline at end of file + return 'HyperCombo' +end diff --git a/SVUI_UnitFrames/class_resources/shaman.lua b/SVUI_UnitFrames/class_resources/shaman.lua index 523b82f..0ea7e52 100644 --- a/SVUI_UnitFrames/class_resources/shaman.lua +++ b/SVUI_UnitFrames/class_resources/shaman.lua @@ -62,7 +62,7 @@ local Reposition = function(self) local bar = self.TotemBars local size = db.classbar.height local width = size * totemMax - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -81,7 +81,7 @@ local Reposition = function(self) if i==1 then bar[i]:SetPoint("TOPLEFT", bar, "TOPLEFT", 0, 0) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -1, 0) end end end @@ -109,7 +109,7 @@ function MOD:CreateClassBar(playerFrame) end local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/warlock.lua b/SVUI_UnitFrames/class_resources/warlock.lua index f148621..cec294b 100644 --- a/SVUI_UnitFrames/class_resources/warlock.lua +++ b/SVUI_UnitFrames/class_resources/warlock.lua @@ -93,7 +93,7 @@ local Reposition = function(self) local size = db.classbar.height local width = size * max; local dbOffset = (size * 0.15) - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"], true) end @@ -112,7 +112,7 @@ local Reposition = function(self) if(i == 1) then bar[i]:SetPoint("LEFT", bar) else - bar[i]:ModPoint("LEFT", bar[i - 1], "RIGHT", -2, 0) + bar[i]:SetPoint("LEFT", bar[i - 1], "RIGHT", -2, 0) end end @@ -271,7 +271,7 @@ function MOD:CreateClassBar(playerFrame) bar.MaxCount = max; local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/class_resources/warrior.lua b/SVUI_UnitFrames/class_resources/warrior.lua index 8889f10..d6f13d9 100644 --- a/SVUI_UnitFrames/class_resources/warrior.lua +++ b/SVUI_UnitFrames/class_resources/warrior.lua @@ -44,7 +44,7 @@ local Reposition = function(self) local size = db.classbar.height local width = size * max; - bar.Holder:ModSize(width, size) + bar.Holder:SetSize(width, size) if(not db.classbar.detachFromFrame) then SV:ResetAnchors(L["Classbar"]) end @@ -118,7 +118,7 @@ function MOD:CreateClassBar(playerFrame) local classBarHolder = CreateFrame("Frame", "Player_ClassBar", bar) - classBarHolder:ModPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) + classBarHolder:SetPoint("TOPLEFT", playerFrame, "BOTTOMLEFT", 0, -2) bar:SetPoint("TOPLEFT", classBarHolder, "TOPLEFT", 0, 0) bar.Holder = classBarHolder SV:NewAnchor(bar.Holder, L["Classbar"], nil, OnMove) diff --git a/SVUI_UnitFrames/elements/castbar.lua b/SVUI_UnitFrames/elements/castbar.lua index c29de52..2126fa3 100644 --- a/SVUI_UnitFrames/elements/castbar.lua +++ b/SVUI_UnitFrames/elements/castbar.lua @@ -135,7 +135,7 @@ local function SetCastTicks(bar,count,mod) ticks[i] = bar:CreateTexture(nil,'OVERLAY') ticks[i]:SetTexture(SV.media.statusbar.lazer) ticks[i]:SetVertexColor(0,0,0,0.8) - ticks[i]:ModWidth(1) + ticks[i]:SetWidth(1) ticks[i]:SetHeight(bar:GetHeight()) end ticks[i]:ClearAllPoints() @@ -527,8 +527,8 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha castbar.Icon = buttonIcon; local shieldIcon = iconHolder:CreateTexture(nil, "ARTWORK") - shieldIcon:ModPoint("TOPLEFT", buttonIcon, "TOPLEFT", -7, 7) - shieldIcon:ModPoint("BOTTOMRIGHT", buttonIcon, "BOTTOMRIGHT", 7, -8) + shieldIcon:SetPoint("TOPLEFT", buttonIcon, "TOPLEFT", -7, 7) + shieldIcon:SetPoint("BOTTOMRIGHT", buttonIcon, "BOTTOMRIGHT", 7, -8) shieldIcon:SetTexture("Interface\\Addons\\SVUI_UnitFrames\\assets\\Castbar\\SHIELD") castbar.Shield = shieldIcon; @@ -563,7 +563,7 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha hadouken:SetWidth(50) hadouken:SetAlpha(0.9) - castbarHolder:ModPoint("TOP", frame, "BOTTOM", 0, isBoss and -4 or -35) + castbarHolder:SetPoint("TOP", frame, "BOTTOM", 0, isBoss and -4 or -35) if reversed then castbar:SetReverseFill(true) @@ -597,10 +597,10 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha SV.Animate:Sprite4(hadouken[2],false,false,true) - castbar:ModPoint("BOTTOMLEFT", castbarHolder, "BOTTOMLEFT", 1, 1) - organizer:ModPoint("LEFT", castbar, "RIGHT", 4, 0) + castbar:SetPoint("BOTTOMLEFT", castbarHolder, "BOTTOMLEFT", 1, 1) + organizer:SetPoint("LEFT", castbar, "RIGHT", 4, 0) - castbar.Time:ModPoint("RIGHT", castbar, "LEFT", -4, 0) + castbar.Time:SetPoint("RIGHT", castbar, "LEFT", -4, 0) else hadouken[1] = hadouken:CreateTexture(nil, "ARTWORK") hadouken[1]:SetAllPoints(hadouken) @@ -632,13 +632,13 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha SV.Animate:Sprite4(hadouken[2],false,false,true) - castbar:ModPoint("BOTTOMRIGHT", castbarHolder, "BOTTOMRIGHT", -1, 1) - organizer:ModPoint("RIGHT", castbar, "LEFT", -4, 0) + castbar:SetPoint("BOTTOMRIGHT", castbarHolder, "BOTTOMRIGHT", -1, 1) + organizer:SetPoint("RIGHT", castbar, "LEFT", -4, 0) - castbar.Time:ModPoint("LEFT", castbar, "RIGHT", 4, 0) + castbar.Time:SetPoint("LEFT", castbar, "RIGHT", 4, 0) end - -- castbar.Time:ModPoint("CENTER", organizer, "CENTER", 0, 0) + -- castbar.Time:SetPoint("CENTER", organizer, "CENTER", 0, 0) -- castbar.Time:SetJustifyH("CENTER") castbar.Text:SetAllPoints(castbar) @@ -655,7 +655,7 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha castbar.pewpew = false castbar:SetStatusBarTexture(SV.media.statusbar.glow) - castbarHolder:ModPoint("TOP", frame, "BOTTOM", 0, -4) + castbarHolder:SetPoint("TOP", frame, "BOTTOM", 0, -4) castbar:InsetPoints(castbarHolder, 2, 2) bgFrame:SetAllPoints(castbarHolder) @@ -666,9 +666,9 @@ function MOD:CreateCastbar(frame, reversed, moverName, ryu, useFader, isBoss, ha if reversed then castbar:SetReverseFill(true) - organizer:ModPoint("LEFT", castbar, "RIGHT", 6, 0) + organizer:SetPoint("LEFT", castbar, "RIGHT", 6, 0) else - organizer:ModPoint("RIGHT", castbar, "LEFT", -6, 0) + organizer:SetPoint("RIGHT", castbar, "LEFT", -6, 0) end end diff --git a/SVUI_UnitFrames/elements/essentials.lua b/SVUI_UnitFrames/elements/essentials.lua index 51a70dc..e2e1389 100644 --- a/SVUI_UnitFrames/elements/essentials.lua +++ b/SVUI_UnitFrames/elements/essentials.lua @@ -232,23 +232,23 @@ end local function ADDInfoBG(frame) local bg = frame.InfoPanel:CreateTexture(nil, "BACKGROUND") - bg:ModPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) - bg:ModPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, 0) + bg:SetPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) + bg:SetPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, 0) bg:SetTexture(1, 1, 1, 1) bg:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 0.7) frame.InfoPanelBG = bg local left = frame.InfoPanel:CreateTexture(nil, "BACKGROUND") - left:ModPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 0, -1) - left:ModPoint("BOTTOMLEFT", frame.InfoPanel, "BOTTOMLEFT", 0, 0) + left:SetPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 0, -1) + left:SetPoint("BOTTOMLEFT", frame.InfoPanel, "BOTTOMLEFT", 0, 0) left:SetWidth(2) left:SetTexture(1, 1, 1, 1) left:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) frame.InfoPanelLeft = left local right = frame.InfoPanel:CreateTexture(nil, "BACKGROUND") - right:ModPoint("TOPRIGHT", frame.ActionPanel, "TOPRIGHT", 0, -1) - right:ModPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, 0) + right:SetPoint("TOPRIGHT", frame.ActionPanel, "TOPRIGHT", 0, -1) + right:SetPoint("BOTTOMRIGHT", frame.InfoPanel, "BOTTOMRIGHT", 0, 0) right:SetWidth(2) right:SetTexture(1, 1, 1, 1) right:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 1) @@ -264,8 +264,8 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) local info = CreateFrame("Frame", nil, frame) info:SetFrameStrata("BACKGROUND") info:SetFrameLevel(0) - info:ModPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) - info:ModPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) + info:SetPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) + info:SetPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) info:SetHeight(baseSize) frame.TextGrip = CreateFrame("Frame", nil, info) @@ -311,8 +311,8 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) end frame.ActionPanel.class = CreateFrame("Frame", nil, frame.TextGrip) - frame.ActionPanel.class:ModSize(18) - frame.ActionPanel.class:ModPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) + frame.ActionPanel.class:SetSize(18) + frame.ActionPanel.class:SetPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) frame.ActionPanel.class:SetStyle("Frame", "Default", true, 2, 0, 0) frame.ActionPanel.class.texture = frame.ActionPanel.class.Panel:CreateTexture(nil, "BORDER") @@ -374,8 +374,8 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) local info = CreateFrame("Frame", nil, frame) info:SetFrameStrata("BACKGROUND") info:SetFrameLevel(0) - info:ModPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) - info:ModPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) + info:SetPoint("TOPLEFT", frame.ActionPanel, "BOTTOMLEFT", 0, 1) + info:SetPoint("TOPRIGHT", frame.ActionPanel, "BOTTOMRIGHT", 0, 1) info:SetHeight(baseSize) frame.InfoPanel = info; @@ -389,8 +389,8 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.TextGrip = CreateFrame("Frame", nil, frame) frame.TextGrip:SetFrameStrata("LOW") frame.TextGrip:SetFrameLevel(20) - frame.TextGrip:ModPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) - frame.TextGrip:ModPoint("BOTTOMRIGHT", frame.ActionPanel, "BOTTOMRIGHT", -2, 2) + frame.TextGrip:SetPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", 2, -2) + frame.TextGrip:SetPoint("BOTTOMRIGHT", frame.ActionPanel, "BOTTOMRIGHT", -2, 2) end frame.TextGrip.Name = CreateNameText(frame.TextGrip, unit) @@ -403,7 +403,7 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.TextGrip.Health:SetFontObject(_G[fontgroup]) offset = reverse and 2 or -2; direction = reverse and "LEFT" or "RIGHT"; - frame.TextGrip.Health:ModPoint(direction, frame.TextGrip, direction, offset, 0) + frame.TextGrip.Health:SetPoint(direction, frame.TextGrip, direction, offset, 0) end if(not noPowerText) then @@ -411,13 +411,13 @@ function MOD:SetActionPanel(frame, unit, noHealthText, noPowerText, noMiscText) frame.TextGrip.Power:SetFontObject(_G[fontgroup]) offset = reverse and -2 or 2; direction = reverse and "RIGHT" or "LEFT"; - frame.TextGrip.Power:ModPoint(direction, frame.TextGrip, direction, offset, 0) + frame.TextGrip.Power:SetPoint(direction, frame.TextGrip, direction, offset, 0) end if(not noMiscText) then frame.TextGrip.Misc = frame.TextGrip:CreateFontString(nil, "OVERLAY") frame.TextGrip.Misc:SetFontObject(_G[fontgroup]) - frame.TextGrip.Misc:ModPoint("CENTER", frame, "CENTER", 0, 0) + frame.TextGrip.Misc:SetPoint("CENTER", frame, "CENTER", 0, 0) end frame.MasterGrip = CreateFrame("Frame", nil, frame) @@ -667,9 +667,9 @@ local PostUpdateAltPower = function(self, min, current, max) elseif(unit and unit:find("boss%d") and self.text) then self.text:SetTextColor(self:GetStatusBarColor()) if not parent.TextGrip.Power:GetText() or parent.TextGrip.Power:GetText() == "" then - self.text:ModPoint("BOTTOMRIGHT", parent.Health, "BOTTOMRIGHT") + self.text:SetPoint("BOTTOMRIGHT", parent.Health, "BOTTOMRIGHT") else - self.text:ModPoint("RIGHT", parent.TextGrip.Power, "LEFT", 2, 0) + self.text:SetPoint("RIGHT", parent.TextGrip.Power, "LEFT", 2, 0) end if remaining > 0 then self.text:SetText("|cffD7BEA5[|r"..format("%d%%", remaining).."|cffD7BEA5]|r") diff --git a/SVUI_UnitFrames/elements/misc.lua b/SVUI_UnitFrames/elements/misc.lua index ff2c3c9..d3f5f35 100644 --- a/SVUI_UnitFrames/elements/misc.lua +++ b/SVUI_UnitFrames/elements/misc.lua @@ -143,8 +143,8 @@ VARIOUS ICONS ]]-- function MOD:CreateResurectionIcon(frame) local rez = frame.TextGrip:CreateTexture(nil, "OVERLAY") - rez:ModPoint("CENTER", frame.TextGrip.Health, "CENTER") - rez:ModSize(30, 25) + rez:SetPoint("CENTER", frame.TextGrip.Health, "CENTER") + rez:SetSize(30, 25) rez:SetDrawLayer("OVERLAY", 7) return rez end @@ -153,8 +153,8 @@ function MOD:CreateReadyCheckIcon(frame) local rdyHolder = CreateFrame("Frame", nil, frame.TextGrip) rdyHolder:SetAllPoints(frame) local rdy = rdyHolder:CreateTexture(nil, "OVERLAY", nil, 7) - rdy:ModSize(18) - rdy:ModPoint("RIGHT", rdyHolder, "RIGHT", 0, 0) + rdy:SetSize(18) + rdy:SetPoint("RIGHT", rdyHolder, "RIGHT", 0, 0) return rdy end @@ -215,8 +215,8 @@ CONFIGURABLE ICONS function MOD:CreateRaidIcon(frame) local rIcon = frame.TextGrip:CreateTexture(nil, "OVERLAY", nil, 2) rIcon:SetTexture([[Interface\TargetingFrame\UI-RaidTargetingIcons]]) - rIcon:ModSize(18) - rIcon:ModPoint("CENTER", frame.TextGrip, "TOP", 0, 2) + rIcon:SetSize(18) + rIcon:SetPoint("CENTER", frame.TextGrip, "TOP", 0, 2) return rIcon end @@ -250,8 +250,8 @@ function MOD:CreateRoleIcon(frame) local rIconHolder = CreateFrame("Frame", nil, parent) rIconHolder:SetAllPoints() local rIcon = rIconHolder:CreateTexture(nil, "ARTWORK", nil, 2) - rIcon:ModSize(14) - rIcon:ModPoint("BOTTOMRIGHT", rIconHolder, "BOTTOMRIGHT") + rIcon:SetSize(14) + rIcon:SetPoint("BOTTOMRIGHT", rIconHolder, "BOTTOMRIGHT") rIcon.Override = UpdateRoleIcon; frame:RegisterEvent("UNIT_CONNECTION", UpdateRoleIcon) return rIcon @@ -260,23 +260,23 @@ end function MOD:CreateRaidRoleFrames(frame) local parent = frame.TextGrip or frame; local raidRoles = CreateFrame("Frame", nil, frame) - raidRoles:ModSize(24, 12) - raidRoles:ModPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", -2, 4) + raidRoles:SetSize(24, 12) + raidRoles:SetPoint("TOPLEFT", frame.ActionPanel, "TOPLEFT", -2, 4) raidRoles:SetFrameLevel(parent:GetFrameLevel() + 50) frame.Leader = raidRoles:CreateTexture(nil, "OVERLAY") - frame.Leader:ModSize(12, 12) + frame.Leader:SetSize(12, 12) frame.Leader:SetTexture(MOD.media.lml) frame.Leader:SetTexCoord(0, 0.5, 0, 0.5) frame.Leader:SetVertexColor(1, 0.85, 0) - frame.Leader:ModPoint("LEFT") + frame.Leader:SetPoint("LEFT") frame.MasterLooter = raidRoles:CreateTexture(nil, "OVERLAY") - frame.MasterLooter:ModSize(12, 12) + frame.MasterLooter:SetSize(12, 12) frame.MasterLooter:SetTexture(MOD.media.lml) frame.MasterLooter:SetTexCoord(0.5, 1, 0, 0.5) frame.MasterLooter:SetVertexColor(1, 0.6, 0) - frame.MasterLooter:ModPoint("RIGHT") + frame.MasterLooter:SetPoint("RIGHT") frame.Leader.PostUpdate = MOD.RaidRoleUpdate; frame.MasterLooter.PostUpdate = MOD.RaidRoleUpdate; @@ -297,15 +297,15 @@ function MOD:RaidRoleUpdate() if db and db.icons and db.icons.raidRoleIcons then local settings = db.icons.raidRoleIcons if leaderShown and settings.position == "TOPLEFT"then - leaderIcon:ModPoint("LEFT", frame, "LEFT") - looterIcon:ModPoint("RIGHT", frame, "RIGHT") + leaderIcon:SetPoint("LEFT", frame, "LEFT") + looterIcon:SetPoint("RIGHT", frame, "RIGHT") elseif leaderShown and settings.position == "TOPRIGHT" then - leaderIcon:ModPoint("RIGHT", frame, "RIGHT") - looterIcon:ModPoint("LEFT", frame, "LEFT") + leaderIcon:SetPoint("RIGHT", frame, "RIGHT") + looterIcon:SetPoint("LEFT", frame, "LEFT") elseif looterShown and settings.position == "TOPLEFT" then - looterIcon:ModPoint("LEFT", frame, "LEFT") + looterIcon:SetPoint("LEFT", frame, "LEFT") else - looterIcon:ModPoint("RIGHT", frame, "RIGHT") + looterIcon:SetPoint("RIGHT", frame, "RIGHT") end end end @@ -318,8 +318,8 @@ function MOD:CreatePlayerIndicators(frame) local resting = CreateFrame("Frame",nil,frame) resting:SetFrameStrata("MEDIUM") resting:SetFrameLevel(20) - resting:ModSize(26,26) - resting:ModPoint("BOTTOMRIGHT", frame.Health, "BOTTOMRIGHT", 0, 0) + resting:SetSize(26,26) + resting:SetPoint("BOTTOMRIGHT", frame.Health, "BOTTOMRIGHT", 0, 0) resting.bg = resting:CreateTexture(nil,"OVERLAY",nil,1) resting.bg:SetAllPoints(resting) resting.bg:SetTexture(MOD.media.playerstate) @@ -328,8 +328,8 @@ function MOD:CreatePlayerIndicators(frame) local combat = CreateFrame("Frame",nil,frame) combat:SetFrameStrata("MEDIUM") combat:SetFrameLevel(30) - combat:ModSize(26,26) - combat:ModPoint("BOTTOMLEFT", frame , "TOPRIGHT", 3, 3) + combat:SetSize(26,26) + combat:SetPoint("BOTTOMLEFT", frame , "TOPRIGHT", 3, 3) combat.bg = combat:CreateTexture(nil,"OVERLAY",nil,5) combat.bg:SetAllPoints(combat) combat.bg:SetTexture(MOD.media.playerstate) @@ -638,8 +638,8 @@ end function MOD:CreateResolveBar(frame) local resolve = CreateFrame("Frame", nil, frame) - resolve:ModPoint("TOPLEFT", frame.Health, "TOPLEFT", 0, 0) - resolve:ModPoint("TOPRIGHT", frame.Health, "TOPRIGHT", 0, 0) + resolve:SetPoint("TOPLEFT", frame.Health, "TOPLEFT", 0, 0) + resolve:SetPoint("TOPRIGHT", frame.Health, "TOPRIGHT", 0, 0) resolve:SetHeight(8) local bar = CreateFrame('StatusBar', nil, resolve) diff --git a/SVUI_UnitFrames/frames.lua b/SVUI_UnitFrames/frames.lua index df9ef1f..eb869ae 100644 --- a/SVUI_UnitFrames/frames.lua +++ b/SVUI_UnitFrames/frames.lua @@ -172,10 +172,10 @@ local UpdatePlayerFrame = function(self) MOD.RefreshUnitMedia(self, "player") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) local lossSize = UNIT_WIDTH * 0.6 self.LossOfControl.stunned:SetSize(lossSize, lossSize) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "player") @@ -185,7 +185,7 @@ local UpdatePlayerFrame = function(self) if iconDB and iconDB.restIcon and iconDB.restIcon.enable then local size = iconDB.restIcon.size; resting:ClearAllPoints() - resting:ModSize(size) + resting:SetSize(size) SV:SetReversePoint(resting, iconDB.restIcon.attachTo, MASTER_GRIP, iconDB.restIcon.xOffset, iconDB.restIcon.yOffset) if not self:IsElementEnabled("Resting")then self:EnableElement("Resting") @@ -202,7 +202,7 @@ local UpdatePlayerFrame = function(self) if iconDB and iconDB.combatIcon and iconDB.combatIcon.enable then local size = iconDB.combatIcon.size; combat:ClearAllPoints() - combat:ModSize(size) + combat:SetSize(size) SV:SetReversePoint(combat, iconDB.combatIcon.attachTo, MASTER_GRIP, iconDB.combatIcon.xOffset, iconDB.combatIcon.yOffset) if not self:IsElementEnabled("Combat")then self:EnableElement("Combat") @@ -217,7 +217,7 @@ local UpdatePlayerFrame = function(self) local pvp = self.PvPText; local point = db.pvp.position; pvp:ClearAllPoints() - pvp:ModPoint(db.pvp.position, MASTER_GRIP, db.pvp.position) + pvp:SetPoint(db.pvp.position, MASTER_GRIP, db.pvp.position) self:Tag(pvp, db.pvp.tags) end do @@ -280,7 +280,7 @@ CONSTRUCTORS["player"] = function(self, unit) self.HealPrediction = MOD:CreateHealPrediction(self, true) self.ResolveBar = MOD:CreateResolveBar(self) self.CombatFade = true; - self:ModPoint("BOTTOMRIGHT", SV.Screen, "BOTTOM", -80, 182) + self:SetPoint("BOTTOMRIGHT", SV.Screen, "BOTTOM", -80, 182) SV:NewAnchor(self, L["Player Frame"]) self.MediaUpdate = MOD.RefreshUnitMedia @@ -303,8 +303,8 @@ local UpdateTargetFrame = function(self) MOD.RefreshUnitMedia(self, "target") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) if not self:IsElementEnabled("ActionPanel")then self:EnableElement("ActionPanel") end @@ -357,7 +357,7 @@ CONSTRUCTORS["target"] = function(self, unit) xray:RegisterForClicks("AnyUp") xray:SetAttribute("type", "macro") xray:SetAttribute("macrotext", "/focus") - xray:ModSize(64,64) + xray:SetSize(64,64) xray:SetFrameStrata("MEDIUM") xray.icon = xray:CreateTexture(nil,"ARTWORK") xray.icon:SetTexture([[Interface\Addons\SVUI_!Core\assets\textures\Doodads\UNIT-XRAY]]) @@ -377,7 +377,7 @@ CONSTRUCTORS["target"] = function(self, unit) self.Friendship = MOD:CreateFriendshipBar(self) self.Range = { insideAlpha = 1, outsideAlpha = 1 } - self:ModPoint("BOTTOMLEFT", SV.Screen, "BOTTOM", 80, 182) + self:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOM", 80, 182) SV:NewAnchor(self, L["Target Frame"]) self.MediaUpdate = MOD.RefreshUnitMedia @@ -396,8 +396,8 @@ local UpdateTargetTargetFrame = function(self) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") MOD.RefreshUnitMedia(self, "targettarget") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "targettarget") self:UpdateAllElements() end @@ -418,7 +418,7 @@ CONSTRUCTORS["targettarget"] = function(self, unit) MOD:CreateAuraFrames(self, key) self.RaidIcon = MOD:CreateRaidIcon(self) self.Range = { insideAlpha = 1, outsideAlpha = 1 } - self:ModPoint("LEFT", SVUI_Target, "RIGHT", 4, 0) + self:SetPoint("LEFT", SVUI_Target, "RIGHT", 4, 0) SV:NewAnchor(self, L["TargetTarget Frame"]) self.MediaUpdate = MOD.RefreshUnitMedia @@ -437,8 +437,8 @@ local UpdatePetFrame = function(self) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") MOD.RefreshUnitMedia(self, "pet") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "pet") do if SVUI_Player and not InCombatLockdown()then @@ -467,7 +467,7 @@ CONSTRUCTORS["pet"] = function(self, unit) self.AuraWatch = MOD:CreateAuraWatch(self, key) self.RaidIcon = MOD:CreateRaidIcon(self) self.Range = { insideAlpha = 1, outsideAlpha = 1 } - self:ModPoint("RIGHT", SVUI_Player, "LEFT", -4, 0) + self:SetPoint("RIGHT", SVUI_Player, "LEFT", -4, 0) SV:NewAnchor(self, L["Pet Frame"]) self.MediaUpdate = MOD.RefreshUnitMedia self.Update = UpdatePetFrame @@ -485,8 +485,8 @@ local UpdatePetTargetFrame = function(self) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") MOD.RefreshUnitMedia(self, "pettarget") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "pettarget") do if SVUI_Pet and not InCombatLockdown()then @@ -510,7 +510,7 @@ CONSTRUCTORS["pettarget"] = function(self, unit) self.Power = MOD:CreatePowerBar(self) MOD:CreateAuraFrames(self, key) self.Range = { insideAlpha = 1, outsideAlpha = 1 } - self:ModPoint("BOTTOM", SVUI_Pet, "TOP", 0, 7) + self:SetPoint("BOTTOM", SVUI_Pet, "TOP", 0, 7) self.snapOffset = -7 SV:NewAnchor(self, L["PetTarget Frame"]) @@ -530,8 +530,8 @@ local UpdateFocusFrame = function(self) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") MOD.RefreshUnitMedia(self, "focus") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "focus") self:UpdateAllElements() @@ -569,7 +569,7 @@ CONSTRUCTORS["focus"] = function(self, unit) xray:RegisterForClicks("AnyUp") xray:SetAttribute("type", "macro") xray:SetAttribute("macrotext", "/clearfocus") - xray:ModSize(50,50) + xray:SetSize(50,50) xray:SetFrameStrata("MEDIUM") xray.icon = xray:CreateTexture(nil,"ARTWORK") xray.icon:SetTexture([[Interface\Addons\SVUI_!Core\assets\textures\Doodads\UNIT-XRAY-CLOSE]]) @@ -587,7 +587,7 @@ CONSTRUCTORS["focus"] = function(self, unit) self.XRay = xray - self:ModPoint("BOTTOMRIGHT", SVUI_Target, "TOPRIGHT", 0, 220) + self:SetPoint("BOTTOMRIGHT", SVUI_Target, "TOPRIGHT", 0, 220) SV:NewAnchor(self, L["Focus Frame"]) self.MediaUpdate = MOD.RefreshUnitMedia @@ -606,8 +606,8 @@ local UpdateFocusTargetFrame = function(self) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") MOD.RefreshUnitMedia(self, "focustarget") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) - _G[self:GetName().."_MOVE"]:ModSize(self:GetSize()) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) + _G[self:GetName().."_MOVE"]:SetSize(self:GetSize()) MOD:RefreshUnitLayout(self, "focustarget") self:UpdateAllElements() end @@ -627,7 +627,7 @@ CONSTRUCTORS["focustarget"] = function(self, unit) MOD:CreateAuraFrames(self, key) self.RaidIcon = MOD:CreateRaidIcon(self) self.Range = { insideAlpha = 1, outsideAlpha = 1 } - self:ModPoint("LEFT", SVUI_Focus, "RIGHT", 12, 0) + self:SetPoint("LEFT", SVUI_Focus, "RIGHT", 12, 0) self.snapOffset = -7 SV:NewAnchor(self, L["FocusTarget Frame"]) @@ -650,23 +650,23 @@ local UpdateBossFrame = function(self) MOD.RefreshUnitMedia(self, "boss") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) self:ClearAllPoints() if(tonumber(INDEX) == 1) then - holder:ModWidth(UNIT_WIDTH) - holder:ModHeight(UNIT_HEIGHT + (UNIT_HEIGHT + 12 + db.castbar.height) * 4) + holder:SetWidth(UNIT_WIDTH) + holder:SetHeight(UNIT_HEIGHT + (UNIT_HEIGHT + 12 + db.castbar.height) * 4) if db.showBy == "UP"then - self:ModPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT") + self:SetPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT") else - self:ModPoint("TOPRIGHT", holder, "TOPRIGHT") + self:SetPoint("TOPRIGHT", holder, "TOPRIGHT") end else local yOffset = (UNIT_HEIGHT + 12 + db.castbar.height) * (INDEX - 1) if db.showBy == "UP"then - self:ModPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT", 0, yOffset) + self:SetPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT", 0, yOffset) else - self:ModPoint("TOPRIGHT", holder, "TOPRIGHT", 0, -yOffset) + self:SetPoint("TOPRIGHT", holder, "TOPRIGHT", 0, -yOffset) end end @@ -704,10 +704,10 @@ CONSTRUCTORS["boss"] = function(self, unit) self:SetAttribute("type2", "focus") if(not _G["SVUI_Boss_MOVE"]) then - self:ModPoint("RIGHT", SV.Screen, "RIGHT", -105, 0) + self:SetPoint("RIGHT", SV.Screen, "RIGHT", -105, 0) SV:NewAnchor(self, L["Boss Frames"], nil, nil, "SVUI_Boss") else - self:ModPoint("TOPRIGHT", lastBossFrame, "BOTTOMRIGHT", 0, -20) + self:SetPoint("TOPRIGHT", lastBossFrame, "BOTTOMRIGHT", 0, -20) end self.MediaUpdate = MOD.RefreshUnitMedia @@ -730,25 +730,25 @@ local UpdateArenaFrame = function(self) MOD.RefreshUnitMedia(self, "arena") self.colors = oUF_SVUI.colors; - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) self:RegisterForClicks(SV.db.UnitFrames.fastClickTarget and "AnyDown" or "AnyUp") self:ClearAllPoints() if(tonumber(INDEX) == 1) then - holder:ModWidth(UNIT_WIDTH) - holder:ModHeight(UNIT_HEIGHT + (UNIT_HEIGHT + 12 + db.castbar.height) * 4) + holder:SetWidth(UNIT_WIDTH) + holder:SetHeight(UNIT_HEIGHT + (UNIT_HEIGHT + 12 + db.castbar.height) * 4) if(db.showBy == "UP") then - self:ModPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT") + self:SetPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT") else - self:ModPoint("TOPRIGHT", holder, "TOPRIGHT") + self:SetPoint("TOPRIGHT", holder, "TOPRIGHT") end else local yOffset = (UNIT_HEIGHT + 12 + db.castbar.height) * (INDEX - 1) if(db.showBy == "UP") then - self:ModPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT", 0, yOffset) + self:SetPoint("BOTTOMRIGHT", holder, "BOTTOMRIGHT", 0, yOffset) else - self:ModPoint("TOPRIGHT", holder, "TOPRIGHT", 0, -yOffset) + self:SetPoint("TOPRIGHT", holder, "TOPRIGHT", 0, -yOffset) end end @@ -762,23 +762,23 @@ local UpdateArenaFrame = function(self) local leftAnchor = self local rightAnchor = self - trinket:ModSize(db.pvp.trinketSize) + trinket:SetSize(db.pvp.trinketSize) trinket:ClearAllPoints() if(db.pvp.trinketPosition == "RIGHT") then - trinket:ModPoint("LEFT", rightAnchor, "RIGHT", db.pvp.trinketX, db.pvp.trinketY) + trinket:SetPoint("LEFT", rightAnchor, "RIGHT", db.pvp.trinketX, db.pvp.trinketY) rightAnchor = trinket else - trinket:ModPoint("RIGHT", leftAnchor, "LEFT", db.pvp.trinketX, db.pvp.trinketY) + trinket:SetPoint("RIGHT", leftAnchor, "LEFT", db.pvp.trinketX, db.pvp.trinketY) leftAnchor = trinket end - badge:ModSize(db.pvp.specSize) + badge:SetSize(db.pvp.specSize) badge:ClearAllPoints() if(db.pvp.specPosition == "RIGHT") then - badge:ModPoint("LEFT", rightAnchor, "RIGHT", db.pvp.specX, db.pvp.specY) + badge:SetPoint("LEFT", rightAnchor, "RIGHT", db.pvp.specX, db.pvp.specY) rightAnchor = badge else - badge:ModPoint("RIGHT", leftAnchor, "LEFT", db.pvp.specX, db.pvp.specY) + badge:SetPoint("RIGHT", leftAnchor, "LEFT", db.pvp.specX, db.pvp.specY) leftAnchor = badge end @@ -871,10 +871,10 @@ CONSTRUCTORS["arena"] = function(self, unit) end if(not _G["SVUI_Arena_MOVE"]) then - self:ModPoint("RIGHT", SV.Screen, "RIGHT", -105, 0) + self:SetPoint("RIGHT", SV.Screen, "RIGHT", -105, 0) SV:NewAnchor(self, L["Arena Frames"], nil, nil, "SVUI_Arena") else - self:ModPoint("TOPRIGHT", lastArenaFrame, "BOTTOMRIGHT", 0, -20) + self:SetPoint("TOPRIGHT", lastArenaFrame, "BOTTOMRIGHT", 0, -20) end self.MediaUpdate = MOD.RefreshUnitMedia diff --git a/SVUI_UnitFrames/groups.lua b/SVUI_UnitFrames/groups.lua index 4f18d96..1398ac4 100644 --- a/SVUI_UnitFrames/groups.lua +++ b/SVUI_UnitFrames/groups.lua @@ -259,7 +259,7 @@ local PartyUnitUpdate = function(self) if altDB.enable then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(altDB) self:SetParent(self.originalParent) - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) self:ClearAllPoints() SV:SetReversePoint(self, altDB.anchorPoint, self.originalParent, altDB.xOffset, altDB.yOffset) else @@ -275,8 +275,8 @@ local PartyUnitUpdate = function(self) health.colorClass = true; health.colorReaction = true; health:ClearAllPoints() - health:ModPoint("TOPRIGHT", self, "TOPRIGHT", -1, -1) - health:ModPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 1, 1) + health:SetPoint("TOPRIGHT", self, "TOPRIGHT", -1, -1) + health:SetPoint("BOTTOMLEFT", self, "BOTTOMLEFT", 1, 1) end do local nametext = self.TextGrip.Name @@ -285,7 +285,7 @@ local PartyUnitUpdate = function(self) else if not InCombatLockdown() then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db, "party") - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) end MOD:RefreshUnitLayout(self, "party") end @@ -300,7 +300,7 @@ UpdateTemplates["party"] = function(self) if not groupFrame.positioned then groupFrame:ClearAllPoints() - groupFrame:ModPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "TOPLEFT", 0, 80) + groupFrame:SetPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "TOPLEFT", 0, 80) RegisterStateDriver(groupFrame, "visibility", "[group:party,nogroup:raid][@raid6,noexists,group:raid] show;hide") SV:NewAnchor(groupFrame, L['Party Frames']); groupFrame.positioned = true; @@ -384,7 +384,7 @@ local RaidUnitUpdate = function(self) local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db) if not InCombatLockdown() then - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) end do @@ -394,8 +394,8 @@ local RaidUnitUpdate = function(self) self:EnableElement("RaidDebuffs") end local actualSz = numMin(db.rdebuffs.size, (UNIT_HEIGHT - 8)) - rdBuffs:ModSize(actualSz) - rdBuffs:ModPoint("CENTER", self, "CENTER", db.rdebuffs.xOffset, db.rdebuffs.yOffset) + rdBuffs:SetSize(actualSz) + rdBuffs:SetPoint("CENTER", self, "CENTER", db.rdebuffs.xOffset, db.rdebuffs.yOffset) rdBuffs:Show() else self:DisableElement("RaidDebuffs") @@ -419,7 +419,7 @@ UpdateTemplates["raid"] = function(self) local groupFrame = self:GetParent() if not groupFrame.positioned then groupFrame:ClearAllPoints() - groupFrame:ModPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "TOPLEFT", 0, 80) + groupFrame:SetPoint("BOTTOMLEFT", SV.Dock.BottomLeft, "TOPLEFT", 0, 80) RegisterStateDriver(groupFrame, "visibility", "[@raid6,exists,group:raid] show;hide") SV:NewAnchor(groupFrame, "Raid Frames") groupFrame.positioned = true @@ -496,7 +496,7 @@ UpdateTemplates["raidpet"] = function(self) if not groupFrame.positioned then groupFrame:ClearAllPoints() - groupFrame:ModPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", 4, 433) + groupFrame:SetPoint("BOTTOMLEFT", SV.Screen, "BOTTOMLEFT", 4, 433) RegisterStateDriver(groupFrame, "visibility", "[group:raid] show;hide") SV:NewAnchor(groupFrame, L["Raid Pet Frames"]) groupFrame.positioned = true; @@ -573,7 +573,7 @@ local TankUnitUpdate = function(self) if targets.enable then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(targets) self:SetParent(self.originalParent) - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) self:ClearAllPoints() SV:SetReversePoint(self, targets.anchorPoint, self.originalParent, targets.xOffset, targets.yOffset) else @@ -582,7 +582,7 @@ local TankUnitUpdate = function(self) end elseif not InCombatLockdown() then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db) - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) end MOD:RefreshUnitLayout(self, "tank") do @@ -620,7 +620,7 @@ UpdateTemplates["tank"] = function(self) if not self.positioned then self:ClearAllPoints() - self:ModPoint("BOTTOMLEFT", SV.Dock.TopLeft, "BOTTOMLEFT", 0, 0) + self:SetPoint("BOTTOMLEFT", SV.Dock.TopLeft, "BOTTOMLEFT", 0, 0) SV:NewAnchor(self, L["Tank Frames"]) self.Grip.positionOverride = "TOPLEFT" self:SetAttribute("minHeight", self.dirtyHeight) @@ -687,7 +687,7 @@ local AssistUnitUpdate = function(self) if targets.enable then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(targets) self:SetParent(self.originalParent) - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) self:ClearAllPoints() SV:SetReversePoint(self, targets.anchorPoint, self.originalParent, targets.xOffset, targets.yOffset) else @@ -696,7 +696,7 @@ local AssistUnitUpdate = function(self) end elseif not InCombatLockdown() then local UNIT_WIDTH, UNIT_HEIGHT = MOD:GetActiveSize(db) - self:ModSize(UNIT_WIDTH, UNIT_HEIGHT) + self:SetSize(UNIT_WIDTH, UNIT_HEIGHT) end MOD:RefreshUnitLayout(self, "assist") @@ -730,7 +730,7 @@ UpdateTemplates["assist"] = function(self) if not self.positioned then self:ClearAllPoints() - self:ModPoint("TOPLEFT", SV.Dock.TopLeft, "BOTTOMLEFT", 0, -10) + self:SetPoint("TOPLEFT", SV.Dock.TopLeft, "BOTTOMLEFT", 0, -10) SV:NewAnchor(self, L["Assist Frames"]) self.Grip.positionOverride = "TOPLEFT" self:SetAttribute("minHeight", self.dirtyHeight) @@ -1026,7 +1026,7 @@ local GroupConfigure = function(self) heightCalc = size + 10 end frame.GroupTag:Show() - frame.GroupTag:ModSize(size) + frame.GroupTag:SetSize(size) frame.GroupTag:SetPoint(tagPoint1, frame, tagPoint2, x, y) else frame.GroupTag:Hide() diff --git a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.lua b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.lua index 60fc203..904d9a5 100644 --- a/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.lua +++ b/SVUI_UnitFrames/libs/Plugins/oUF_AuraWatch/oUF_AuraWatch.lua @@ -343,8 +343,8 @@ local ForceUpdate = function(self) aura.missingAlpha = aura.onlyShowMissing and 1 or 0; aura.textThreshold = data.textThreshold or -1; aura.displayText = data.displayText; - aura:ModWidth(watchsize) - aura:ModHeight(watchsize) + aura:SetWidth(watchsize) + aura:SetHeight(watchsize) aura:ClearAllPoints() aura:SetPoint(data.point, frame.Health, data.point, data.xOffset, data.yOffset) @@ -354,8 +354,8 @@ local ForceUpdate = function(self) end if not aura.border then aura.border = aura:CreateTexture(nil, "BACKGROUND") - aura.border:ModPoint("TOPLEFT", -1, 1) - aura.border:ModPoint("BOTTOMRIGHT", 1, -1) + aura.border:SetPoint("TOPLEFT", -1, 1) + aura.border:SetPoint("BOTTOMRIGHT", 1, -1) aura.border:SetTexture([[Interface\BUTTONS\WHITE8X8]]) aura.border:SetVertexColor(0, 0, 0) end