diff --git a/Libs/DF/button.lua b/Libs/DF/button.lua index c7a30df6..fde3a244 100644 --- a/Libs/DF/button.lua +++ b/Libs/DF/button.lua @@ -378,7 +378,7 @@ local ButtonMetaFunctions = _G[DF.GlobalWidgetControlNames ["button"]] if (normal) then self.button:SetNormalTexture (normal) elseif (_type (normal) ~= "boolean") then - self.button:SetNormalTexture (nil) + self.button:SetNormalTexture ("") end if (_type (highlight) == "boolean") then @@ -386,7 +386,7 @@ local ButtonMetaFunctions = _G[DF.GlobalWidgetControlNames ["button"]] self.button:SetHighlightTexture (normal, "ADD") end elseif (highlight == nil) then - self.button:SetHighlightTexture (nil) + self.button:SetHighlightTexture ("") else self.button:SetHighlightTexture (highlight, "ADD") end @@ -396,7 +396,7 @@ local ButtonMetaFunctions = _G[DF.GlobalWidgetControlNames ["button"]] self.button:SetPushedTexture (normal) end elseif (pressed == nil) then - self.button:SetPushedTexture (nil) + self.button:SetPushedTexture ("") else self.button:SetPushedTexture (pressed, "ADD") end @@ -406,7 +406,7 @@ local ButtonMetaFunctions = _G[DF.GlobalWidgetControlNames ["button"]] self.button:SetDisabledTexture (normal) end elseif (disabled == nil) then - self.button:SetDisabledTexture (nil) + self.button:SetDisabledTexture ("") else self.button:SetDisabledTexture (disabled, "ADD") end @@ -544,10 +544,10 @@ local ButtonMetaFunctions = _G[DF.GlobalWidgetControlNames ["button"]] --> custom textures function ButtonMetaFunctions:InstallCustomTexture (texture, rect, coords, use_split, side_textures, side_textures2) - self.button:SetNormalTexture (nil) - self.button:SetPushedTexture (nil) - self.button:SetDisabledTexture (nil) - self.button:SetHighlightTexture (nil) + self.button:SetNormalTexture ("") + self.button:SetPushedTexture ("") + self.button:SetDisabledTexture ("") + self.button:SetHighlightTexture ("") local button = self.button diff --git a/Libs/DF/cooltip.lua b/Libs/DF/cooltip.lua index b6276e88..dd6ec05f 100644 --- a/Libs/DF/cooltip.lua +++ b/Libs/DF/cooltip.lua @@ -1084,7 +1084,7 @@ function DF:CreateCoolTip() menuButton.leftIcon:SetDesaturated (leftIconTable [9]) else - menuButton.leftIcon:SetTexture (nil) + menuButton.leftIcon:SetTexture ("") menuButton.leftIcon:SetWidth (1) menuButton.leftIcon:SetHeight (1) end @@ -1107,7 +1107,7 @@ function DF:CreateCoolTip() menuButton.rightIcon:SetDesaturated (rightIconTable [9]) else - menuButton.rightIcon:SetTexture (nil) + menuButton.rightIcon:SetTexture ("") menuButton.rightIcon:SetWidth (1) menuButton.rightIcon:SetHeight (1) end diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 8fea8ea6..c64eb2b3 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 336 +local dversion = 337 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) @@ -2905,7 +2905,7 @@ function DF:CreateAnimation (animation, type, order, duration, arg1, arg2, arg3, anim:SetToAlpha (arg2) elseif (type == "SCALE") then - anim:SetFromScale (arg1, arg2) + anim:SetScaleFrom (arg1, arg2) anim:SetToScale (arg3, arg4) anim:SetOrigin (arg5 or "center", arg6 or 0, arg7 or 0) --point, x, y diff --git a/Libs/NickTag-1.0/NickTag-1.0.lua b/Libs/NickTag-1.0/NickTag-1.0.lua index ab7701f7..91ec9b0a 100644 --- a/Libs/NickTag-1.0/NickTag-1.0.lua +++ b/Libs/NickTag-1.0/NickTag-1.0.lua @@ -929,6 +929,7 @@ do buttonsbg [#buttonsbg+1] = newbutton end + --[=[ local avatar_list = CreateFrame ("ScrollFrame", "AvatarPickFrameAvatarScroll", avatar_pick_frame, "ListScrollFrameTemplate") avatar_list:SetPoint ("topleft", avatar_pick_frame, "topleft", 10, -10) local background_list = CreateFrame ("ScrollFrame", "AvatarPickFrameBackgroundScroll", avatar_pick_frame, "ListScrollFrameTemplate") @@ -1092,6 +1093,7 @@ do end end) + --]=] avatar_pick_frame:Hide() end diff --git a/classes/class_damage.lua b/classes/class_damage.lua index 20ef7afa..66b93860 100644 --- a/classes/class_damage.lua +++ b/classes/class_damage.lua @@ -4072,7 +4072,7 @@ function atributo_damage:MontaInfoFriendlyFire() if (Details.class_coords [classe]) then barra.icone:SetTexCoord (_unpack (Details.class_coords [classe])) else - barra.icone:SetTexture (nil) + barra.icone:SetTexture ("") end local color = Details.class_colors [classe] diff --git a/frames/anime.lua b/frames/anime.lua index 6355c562..c12b6972 100644 --- a/frames/anime.lua +++ b/frames/anime.lua @@ -233,7 +233,7 @@ function _detalhes.PlayBestDamageOnGuild (damage) Portrait.scale:SetDuration (0.21600000560284) Portrait.scale:SetStartDelay (0) Portrait.scale:SetEndDelay (0) - Portrait.scale:SetFromScale (0, 0) + Portrait.scale:SetScaleFrom (0, 0) Portrait.scale:SetToScale (1, 1) Portrait.scale:SetOrigin ("center", 0, 0) Portrait.alpha = MainAnimationGroup:CreateAnimation ("ALPHA") diff --git a/frames/fw_mods.lua b/frames/fw_mods.lua index 3cba8eb1..f2a64979 100644 --- a/frames/fw_mods.lua +++ b/frames/fw_mods.lua @@ -228,10 +228,10 @@ function gump:NewDetailsButton (parent, container, instancia, func, param1, para end function new_button:InstallCustomTexture (texture, rect) - new_button:SetNormalTexture(nil) - new_button:SetPushedTexture(nil) - new_button:SetDisabledTexture(nil) - new_button:SetHighlightTexture(nil) + new_button:SetNormalTexture("") + new_button:SetPushedTexture("") + new_button:SetDisabledTexture("") + new_button:SetHighlightTexture("") texture = texture or "Interface\\AddOns\\Details\\images\\default_button" new_button.texture = new_button:CreateTexture (nil, "background") diff --git a/frames/window_main.lua b/frames/window_main.lua index 3daa863e..53a93e60 100644 --- a/frames/window_main.lua +++ b/frames/window_main.lua @@ -3117,7 +3117,7 @@ function _detalhes:InstanceAlert (msg, icon, time, clickfunc, doflash, forceAler self.alert.icon:SetTexCoord (0, 1, 0, 1) end else - self.alert.icon:SetTexture (nil) + self.alert.icon:SetTexture ("") end self.alert.button.func = nil @@ -4124,7 +4124,7 @@ function gump:CreateNewLine (instancia, index) --> row background texture newLine.background = newLine:CreateTexture (nil, "background") - newLine.background:SetTexture() + newLine.background:SetTexture("") newLine.background:SetAllPoints (newLine) newLine.statusbar:SetStatusBarColor (0, 0, 0, 0) @@ -5505,7 +5505,7 @@ function _detalhes:StatusBarAlert (text, icon, color, time) statusbar.icon:SetTexCoord (0, 1, 0, 1) end else - statusbar.icon:SetTexture (nil) + statusbar.icon:SetTexture ("") end if (color) then diff --git a/frames/window_playerbreakdown.lua b/frames/window_playerbreakdown.lua index 7cffc8e9..84efcda3 100644 --- a/frames/window_playerbreakdown.lua +++ b/frames/window_playerbreakdown.lua @@ -146,7 +146,7 @@ function _detalhes:AbreJanelaInfo (jogador, from_att_change, refresh, ShiftKeyDo if (info.barras2) then for index, barra in ipairs (info.barras2) do - barra.icone:SetTexture (nil) + barra.icone:SetTexture ("") barra.icone:SetTexCoord (0, 1, 0, 1) end end @@ -365,7 +365,7 @@ function gump:TrocaBackgroundInfo() if (info.atributo == 1) then --> DANO if (info.sub_atributo == 1 or info.sub_atributo == 2) then --> damage done / dps - info.bg1_sec_texture:SetTexture (nil) + info.bg1_sec_texture:SetTexture ("") info.tipo = 1 if (info.sub_atributo == 2) then @@ -428,7 +428,7 @@ function gump:TrocaBackgroundInfo() elseif (info.atributo == 2) then --> HEALING if (info.sub_atributo == 1 or info.sub_atributo == 2 or info.sub_atributo == 3) then --> damage done / dps - info.bg1_sec_texture:SetTexture (nil) + info.bg1_sec_texture:SetTexture ("") info.tipo = 1 if (info.sub_atributo == 3) then @@ -462,12 +462,12 @@ function gump:TrocaBackgroundInfo() end elseif (info.atributo == 3) then --> REGEN - info.bg1_sec_texture:SetTexture (nil) + info.bg1_sec_texture:SetTexture ("") info.tipo = 2 info.targets:SetText ("Vindo de:") elseif (info.atributo == 4) then --> MISC - info.bg1_sec_texture:SetTexture (nil) + info.bg1_sec_texture:SetTexture ("") info.tipo = 2 info.targets:SetText (Loc ["STRING_TARGETS"] .. ":") @@ -2636,7 +2636,7 @@ function gump:CriaJanelaInfo() framebg:Hide() label1:SetText ("") label2:SetText ("") - icon1:SetTexture (nil) + icon1:SetTexture ("") end --> habilidade usada para interromper @@ -2981,7 +2981,7 @@ function gump:CriaJanelaInfo() local bar_2 = frame2.bars [i] local bar_3 = frame3.bars [i] - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText (empty_text) bar [2].lefttext:SetTextColor (.5, .5, .5, 1) bar [2].righttext:SetText ("") @@ -2989,7 +2989,7 @@ function gump:CriaJanelaInfo() bar [2]:SetValue (0) bar [2]:SetBackdropColor (1, 1, 1, 0) bar [3][4] = nil - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -2997,7 +2997,7 @@ function gump:CriaJanelaInfo() bar_2 [2]:SetValue (0) bar_2 [2]:SetBackdropColor (1, 1, 1, 0) bar_2 [3][4] = nil - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3127,7 +3127,7 @@ function gump:CriaJanelaInfo() bar_2 [3][4] = player_2 else - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -3137,7 +3137,7 @@ function gump:CriaJanelaInfo() bar_2 [3][4] = nil end else - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -3198,7 +3198,7 @@ function gump:CriaJanelaInfo() bar_3 [3][4] = player_3 else - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3208,7 +3208,7 @@ function gump:CriaJanelaInfo() bar_3 [3][4] = nil end else - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3219,7 +3219,7 @@ function gump:CriaJanelaInfo() end else - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText (empty_text) bar [2].lefttext:SetTextColor (.5, .5, .5, 1) bar [2].righttext:SetText ("") @@ -3227,7 +3227,7 @@ function gump:CriaJanelaInfo() bar [2]:SetValue (0) bar [2]:SetBackdropColor (1, 1, 1, 0) bar [3][4] = nil - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -3235,7 +3235,7 @@ function gump:CriaJanelaInfo() bar_2 [2]:SetValue (0) bar_2 [2]:SetBackdropColor (1, 1, 1, 0) bar_2 [3][4] = nil - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3456,7 +3456,7 @@ function gump:CriaJanelaInfo() bar_2 [3][3] = _math_floor (spell.c_amt / spell.counter * 100) --tooltip critical bar_2 [2]:SetBackdropColor (1, 1, 1, 0) else - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -3531,7 +3531,7 @@ function gump:CriaJanelaInfo() bar_3 [3][2] = spell.total / spell.counter --tooltip average bar_3 [3][3] = _math_floor (spell.c_amt / spell.counter * 100) --tooltip critical else - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3540,7 +3540,7 @@ function gump:CriaJanelaInfo() bar_3 [2]:SetBackdropColor (1, 1, 1, 0) end else - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3549,14 +3549,14 @@ function gump:CriaJanelaInfo() bar_3 [2]:SetBackdropColor (1, 1, 1, 0) end else - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText (empty_text) bar [2].lefttext:SetTextColor (.5, .5, .5, 1) bar [2].righttext:SetText ("") bar [2]:SetValue (0) bar [2]:SetBackdropColor (1, 1, 1, 0) local bar_2 = frame2.bars [i] - bar_2 [1]:SetTexture (nil) + bar_2 [1]:SetTexture ("") bar_2 [2].lefttext:SetText (empty_text) bar_2 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_2 [2].righttext:SetText ("") @@ -3564,7 +3564,7 @@ function gump:CriaJanelaInfo() bar_2 [2]:SetValue (0) bar_2 [2]:SetBackdropColor (1, 1, 1, 0) local bar_3 = frame3.bars [i] - bar_3 [1]:SetTexture (nil) + bar_3 [1]:SetTexture ("") bar_3 [2].lefttext:SetText (empty_text) bar_3 [2].lefttext:SetTextColor (.5, .5, .5, 1) bar_3 [2].righttext:SetText ("") @@ -3786,7 +3786,7 @@ function gump:CriaJanelaInfo() if (not bar) then bar = frame2.tooltip:CreateBar (index) end - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText ("") bar [2].righttext:SetText ("") bar [2].righttext2:SetText ("") @@ -3840,7 +3840,7 @@ function gump:CriaJanelaInfo() if (not bar) then bar = frame3.tooltip:CreateBar (index) end - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText ("") bar [2].righttext:SetText ("") bar [2].righttext2:SetText ("") @@ -4575,7 +4575,7 @@ function gump:CriaJanelaInfo() function tooltip:Reset() for index, bar in _ipairs (tooltip.bars) do - bar [1]:SetTexture (nil) + bar [1]:SetTexture ("") bar [2].lefttext:SetText ("") bar [2].righttext:SetText ("") bar [2].righttext2:SetText ("") diff --git a/frames/window_playerbreakdown_list.lua b/frames/window_playerbreakdown_list.lua index 97399b74..3c0da458 100644 --- a/frames/window_playerbreakdown_list.lua +++ b/frames/window_playerbreakdown_list.lua @@ -90,7 +90,7 @@ specId, specName, specDescription, specIconId, specRole, specClass = _G.GetSpecializationInfoByID(self.playerObject.spec) end else - self.specIcon:SetTexture(nil) + self.specIcon:SetTexture("") end end @@ -101,14 +101,14 @@ self.roleIcon:SetTexture(roleIcon) self.roleIcon:SetTexCoord(L, R, T, B) else - self.roleIcon:SetTexture(nil) + self.roleIcon:SetTexture("") end else - self.roleIcon:SetTexture(nil) + self.roleIcon:SetTexture("") end --do not show the role icon - self.roleIcon:SetTexture(nil) + self.roleIcon:SetTexture("") --set the player name self.playerName:SetText(Details:GetOnlyName(self.playerObject.nome)) diff --git a/frames/window_report.lua b/frames/window_report.lua index b1ffe1a5..162a35f4 100644 --- a/frames/window_report.lua +++ b/frames/window_report.lua @@ -697,9 +697,9 @@ local function cria_drop_down (este_gump) reverse_checkbox:SetBackdropColor (0, 0, 0, 0.3) reverse_checkbox:SetPoint ("topleft", window.slider, "bottomleft", 0, -8) reverse_checkbox:SetSize (14, 14) - reverse_checkbox:SetNormalTexture (nil) - reverse_checkbox:SetPushedTexture (nil) - reverse_checkbox:SetHighlightTexture (nil) + reverse_checkbox:SetNormalTexture ("") + reverse_checkbox:SetPushedTexture ("") + reverse_checkbox:SetHighlightTexture ("") _G [reverse_checkbox:GetName().."Text"]:ClearAllPoints() _G [reverse_checkbox:GetName().."Text"]:SetPoint ("left", reverse_checkbox, "right", 2, 0) @@ -958,7 +958,7 @@ local function cria_drop_down (este_gump) function window:RefreshRecentlyReported() for i = 1, window.max_last_buttons do local b = window.recently_report_buttons [i] - b.icon:SetTexture (nil) + b.icon:SetTexture ("") b:Hide() end