From 0d560a094b34ec09f369967ae5d83a0e38c3c009 Mon Sep 17 00:00:00 2001 From: D4KiR <23246564+d4kir92@users.noreply.github.com> Date: Tue, 1 Oct 2024 18:46:32 +0200 Subject: [PATCH] v1.7.31 --- MoveAny.toc | 2 +- MoveAny_Cata.toc | 2 +- MoveAny_TBC.toc | 2 +- MoveAny_Vanilla.toc | 2 +- MoveAny_Wrath.toc | 2 +- libs/D4Lib/D4Frames.lua | 40 +++++++++++++++++++++++++--------------- settings.lua | 10 +++++----- 7 files changed, 35 insertions(+), 25 deletions(-) diff --git a/MoveAny.toc b/MoveAny.toc index 996cacd..dda5fc2 100644 --- a/MoveAny.toc +++ b/MoveAny.toc @@ -4,7 +4,7 @@ ## Interface-Cata: 40400 ## Interface: 110002 -## Version: 1.7.30 +## Version: 1.7.31 ## Title: MoveAny by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Move Any Ui or Frame ## Author: D4KiR diff --git a/MoveAny_Cata.toc b/MoveAny_Cata.toc index 5516246..ace5ab0 100644 --- a/MoveAny_Cata.toc +++ b/MoveAny_Cata.toc @@ -1,5 +1,5 @@ ## Interface: 40400 -## Version: 1.7.30 +## Version: 1.7.31 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Move Any Ui or Frame ## Author: D4KiR diff --git a/MoveAny_TBC.toc b/MoveAny_TBC.toc index bcd82d4..23764e2 100644 --- a/MoveAny_TBC.toc +++ b/MoveAny_TBC.toc @@ -1,5 +1,5 @@ ## Interface: 20504 -## Version: 1.7.30 +## Version: 1.7.31 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Move Any Ui or Frame ## Author: D4KiR diff --git a/MoveAny_Vanilla.toc b/MoveAny_Vanilla.toc index 3510639..60f3c1a 100644 --- a/MoveAny_Vanilla.toc +++ b/MoveAny_Vanilla.toc @@ -1,5 +1,5 @@ ## Interface: 11504 -## Version: 1.7.30 +## Version: 1.7.31 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Move Any Ui or Frame ## Author: D4KiR diff --git a/MoveAny_Wrath.toc b/MoveAny_Wrath.toc index aeeba9d..d162809 100644 --- a/MoveAny_Wrath.toc +++ b/MoveAny_Wrath.toc @@ -1,5 +1,5 @@ ## Interface: 30403 -## Version: 1.7.30 +## Version: 1.7.31 ## Title: MoveAny |T135994:16:16:0:0|t by |cff3FC7EBD4KiR |T132115:16:16:0:0|t ## Notes: Move Any Ui or Frame ## Author: D4KiR diff --git a/libs/D4Lib/D4Frames.lua b/libs/D4Lib/D4Frames.lua index a217a98..ec0b40c 100644 --- a/libs/D4Lib/D4Frames.lua +++ b/libs/D4Lib/D4Frames.lua @@ -1,4 +1,5 @@ local _, D4 = ... +local X = 0 local Y = 0 local PARENT = nil local TAB = nil @@ -242,6 +243,14 @@ function D4:CreateFrame(tab) return fra end +function D4:SetAppendX(newX) + X = newX +end + +function D4:GetAppendX() + return X +end + function D4:SetAppendY(newY) Y = newY end @@ -273,7 +282,7 @@ function D4:AppendCategory(name, x, y) { ["name"] = name, ["parent"] = PARENT, - ["pTab"] = {"TOPLEFT", x or 5, y or Y}, + ["pTab"] = {"TOPLEFT", x or X, y or Y}, } ) @@ -284,7 +293,7 @@ end function D4:AppendCheckbox(key, value, func, x, y) value = value or false - x = x or 5 + x = x or X if TAB == nil then if TABIsNil == false then TABIsNil = true @@ -303,7 +312,7 @@ function D4:AppendCheckbox(key, value, func, x, y) { ["name"] = key, ["parent"] = PARENT, - ["pTab"] = {"TOPLEFT", x, y or Y}, + ["pTab"] = {"TOPLEFT", x or X, y or Y}, ["value"] = val, ["funcV"] = function(sel, checked) TAB[key] = checked @@ -355,7 +364,7 @@ function D4:AppendSlider(key, value, min, max, steps, decimals, func, lstr) slider.decimals = decimals slider.color = {0, 1, 0, 1} slider.func = func - slider.pTab = {"TOPLEFT", 10, Y} + slider.pTab = {"TOPLEFT", X + 5, Y} D4:CreateSlider(slider) Y = Y - 30 end @@ -366,23 +375,23 @@ function D4:CreateDropdown(key, value, choices, parent) end local text = parent:CreateFontString(nil, nil, "GameFontNormal") - text:SetPoint("TOPLEFT", 10, Y) + text:SetPoint("TOPLEFT", X + 5, Y) text:SetText(D4:Trans(key)) Y = Y - 18 if D4:GetWoWBuild() == "RETAIL" then local Dropdown = CreateFrame("DropdownButton", key, parent, "WowStyle1DropdownTemplate") - Dropdown:SetDefaultText(choices[TAB[key]]) - Dropdown:SetPoint("TOPLEFT", 10, Y) + Dropdown:SetDefaultText(D4:Trans(choices[TAB[key]])) + Dropdown:SetPoint("TOPLEFT", X + 5, Y) Dropdown:SetWidth(200) Dropdown:SetupMenu( function(dropdown, rootDescription) rootDescription:CreateTitle(D4:Trans(key)) - for i, v in pairs(choices) do + for data, name in pairs(choices) do rootDescription:CreateButton( - i, + D4:Trans(name), function() - TAB[key] = v - Dropdown:SetDefaultText(i) + TAB[key] = data + Dropdown:SetDefaultText(D4:Trans(name)) end ) end @@ -395,10 +404,10 @@ function D4:CreateDropdown(key, value, choices, parent) function WPDropDownDemo_Menu(frame, level, menuList) local info = UIDropDownMenu_CreateInfo() if level == 1 then - for i, v in pairs(choices) do - info.text = v - info.arg1 = i - info.checked = v == choices[TAB[key]] + for data, name in pairs(choices) do + info.text = D4:Trans(name) + info.arg1 = data + info.checked = name == choices[TAB[key]] info.func = dropDown.SetValue UIDropDownMenu_AddButton(info) end @@ -416,6 +425,7 @@ function D4:CreateDropdown(key, value, choices, parent) end function D4:AppendDropdown(key, value, choices) + Y = Y - 10 D4:CreateDropdown(key, value, choices, PARENT) Y = Y - 30 end diff --git a/settings.lua b/settings.lua index da06b55..1aafec1 100644 --- a/settings.lua +++ b/settings.lua @@ -486,8 +486,8 @@ function MoveAny:InitMALock() end ) - MoveAny:SetVersion(AddonName, 135994, "1.7.30") - MALock.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.7.30")) + MoveAny:SetVersion(AddonName, 135994, "1.7.31") + MALock.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.7.31")) MALock.CloseButton:SetScript( "OnClick", function() @@ -1097,7 +1097,7 @@ function MoveAny:ShowProfiles() end ) - MAProfiles.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.7.30")) + MAProfiles.TitleText:SetText(format("MoveAny |T135994:16:16:0:0|t v|cff3FC7EB%s", "1.7.31")) MAProfiles.CloseButton:SetScript( "OnClick", function() @@ -3344,7 +3344,7 @@ function MoveAny:LoadAddon() end ) - PetFrame:SetParent(MAPetFrame) + --PetFrame:SetParent(MAPetFrame) MoveAny:SetPoint(PetFrame, "CENTER", MAPetFrame, "CENTER", 0, 0) MoveAny:RegisterWidget( { @@ -4858,7 +4858,7 @@ function MoveAny:LoadAddon() ["name"] = "MoveAny", ["icon"] = 135994, ["dbtab"] = MATAB, - ["vTT"] = {{"MoveAny |T135994:16:16:0:0|t", "v|cff3FC7EB1.7.30"}, {MoveAny:GT("LID_LEFTCLICK"), MoveAny:GT("LID_MMBTNLEFT")}, {MoveAny:GT("LID_RIGHTCLICK"), MoveAny:GT("LID_MMBTNRIGHT")}}, + ["vTT"] = {{"MoveAny |T135994:16:16:0:0|t", "v|cff3FC7EB1.7.31"}, {MoveAny:GT("LID_LEFTCLICK"), MoveAny:GT("LID_MMBTNLEFT")}, {MoveAny:GT("LID_RIGHTCLICK"), MoveAny:GT("LID_MMBTNRIGHT")}}, ["funcL"] = function() MoveAny:ToggleMALock() end,