diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index c64eb2b3..f9a8b09a 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 337 +local dversion = 338 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) @@ -51,6 +51,10 @@ if (not PixelUtil) then end end +function DF.IsDragonflight() + return select(4, GetBuildInfo()) >= 100000 +end + function DF.IsTimewalkWoW() return DF.IsClassicWow() or DF.IsTBCWow() or DF.IsWotLKWow() end @@ -2905,7 +2909,11 @@ function DF:CreateAnimation (animation, type, order, duration, arg1, arg2, arg3, anim:SetToAlpha (arg2) elseif (type == "SCALE") then - anim:SetScaleFrom (arg1, arg2) + if (DF.IsDragonflight()) then + anim:SetScaleFrom (arg1, arg2) + else + anim:SetFromScale (arg1, arg2) + end anim:SetToScale (arg3, arg4) anim:SetOrigin (arg5 or "center", arg6 or 0, arg7 or 0) --point, x, y diff --git a/core/windows.lua b/core/windows.lua index 227b3b10..c51be1cc 100644 --- a/core/windows.lua +++ b/core/windows.lua @@ -1221,12 +1221,13 @@ f.logo:SetPoint ("top", f, "top", 25, 56) f.logo:SetTexture ([[Interface\AddOns\Details\images\logotipo]]) f.logo:SetSize (256, 128) - InterfaceOptions_AddCategory (f) + --InterfaceOptions_AddCategory (f) --> open options panel - f.options_button = CreateFrame ("button", nil, f, "OptionsButtonTemplate") + f.options_button = CreateFrame ("button", nil, f) f.options_button:SetText (Loc ["STRING_INTERFACE_OPENOPTIONS"]) f.options_button:SetPoint ("topleft", f, "topleft", 10, -100) + f.options_button:SetHeight (170) f.options_button:SetWidth (170) f.options_button:SetScript ("OnClick", function (self) local lower_instance = _detalhes:GetLowerInstanceNumber() diff --git a/frames/anime.lua b/frames/anime.lua index c12b6972..f3529faf 100644 --- a/frames/anime.lua +++ b/frames/anime.lua @@ -233,8 +233,15 @@ function _detalhes.PlayBestDamageOnGuild (damage) Portrait.scale:SetDuration (0.21600000560284) Portrait.scale:SetStartDelay (0) Portrait.scale:SetEndDelay (0) - Portrait.scale:SetScaleFrom (0, 0) - Portrait.scale:SetToScale (1, 1) + + if (DetailsFramework.IsDragonflight()) then + Portrait.scale:SetScaleFrom (0, 0) + Portrait.scale:SetScaleTo (1, 1) + else + Portrait.scale:SetFromScale (0, 0) + Portrait.scale:SetToScale (1, 1) + end + Portrait.scale:SetOrigin ("center", 0, 0) Portrait.alpha = MainAnimationGroup:CreateAnimation ("ALPHA") Portrait.alpha:SetTarget (Portrait)