From 845810d303963adece42622c7b37b2efe93fc828 Mon Sep 17 00:00:00 2001 From: Tercio Date: Mon, 29 Aug 2016 17:03:44 -0300 Subject: [PATCH] - framework update to v44. --- Libs/DF/cooltip.lua | 15 ++++--- Libs/DF/fw.lua | 99 ++++++++++++++++++++++++++++++++++++++++++- Libs/DF/panel.lua | 2 +- boot.lua | 6 +-- gumps/janela_info.lua | 7 +-- 5 files changed, 115 insertions(+), 14 deletions(-) diff --git a/Libs/DF/cooltip.lua b/Libs/DF/cooltip.lua index b54e58c4..a47c259f 100644 --- a/Libs/DF/cooltip.lua +++ b/Libs/DF/cooltip.lua @@ -765,12 +765,6 @@ function DF:CreateCoolTip() menuButton.rightText:SetWidth (0) end - if (CoolTip.OptionsTable.RightTextHeight) then - menuButton.rightText:SetHeight (CoolTip.OptionsTable.RightTextHeight) - else - menuButton.rightText:SetHeight (0) - end - if (CoolTip.OptionsTable.TextFont and not rightTextTable [7]) then if (_G [CoolTip.OptionsTable.TextFont]) then menuButton.rightText:SetFontObject (CoolTip.OptionsTable.TextFont) @@ -860,9 +854,18 @@ function DF:CreateCoolTip() menuButton.rightIcon:SetHeight (CoolTip.OptionsTable.IconSize) end + menuButton.leftText:SetHeight (0) + menuButton.rightText:SetHeight (0) + if (CoolTip.Type == 2) then CoolTip:LeftTextSpace (menuButton) end + if (CoolTip.OptionsTable.LeftTextHeight) then + menuButton.leftText:SetHeight (CoolTip.OptionsTable.LeftTextHeight) + end + if (CoolTip.OptionsTable.RightTextHeight) then + menuButton.rightText:SetHeight (CoolTip.OptionsTable.RightTextHeight) + end --> string length if (not isSub) then --> main frame diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 8a28d623..9f68c269 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,5 +1,5 @@ -local dversion = 41 +local dversion = 44 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) @@ -1313,5 +1313,102 @@ function DF:CreateBorder (parent, alpha1, alpha2, alpha3) end +function DF:ReskinSlider (slider, heightOffset) + if (slider.slider) then + slider.cima:SetNormalTexture ([[Interface\Buttons\Arrow-Up-Up]]) + slider.cima:SetPushedTexture ([[Interface\Buttons\Arrow-Up-Down]]) + slider.cima:SetDisabledTexture ([[Interface\Buttons\Arrow-Up-Disabled]]) + slider.cima:GetNormalTexture():ClearAllPoints() + slider.cima:GetPushedTexture():ClearAllPoints() + slider.cima:GetDisabledTexture():ClearAllPoints() + slider.cima:GetNormalTexture():SetPoint ("center", slider.cima, "center", 1, 1) + slider.cima:GetPushedTexture():SetPoint ("center", slider.cima, "center", 1, 1) + slider.cima:GetDisabledTexture():SetPoint ("center", slider.cima, "center", 1, 1) + slider.cima:SetSize (16, 16) + slider.cima:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + slider.cima:SetBackdropColor (0, 0, 0, 0.3) + slider.cima:SetBackdropBorderColor (0, 0, 0, 1) + + slider.baixo:SetNormalTexture ([[Interface\Buttons\Arrow-Down-Up]]) + slider.baixo:SetPushedTexture ([[Interface\Buttons\Arrow-Down-Down]]) + slider.baixo:SetDisabledTexture ([[Interface\Buttons\Arrow-Down-Disabled]]) + slider.baixo:GetNormalTexture():ClearAllPoints() + slider.baixo:GetPushedTexture():ClearAllPoints() + slider.baixo:GetDisabledTexture():ClearAllPoints() + slider.baixo:GetNormalTexture():SetPoint ("center", slider.baixo, "center", 1, -5) + slider.baixo:GetPushedTexture():SetPoint ("center", slider.baixo, "center", 1, -5) + slider.baixo:GetDisabledTexture():SetPoint ("center", slider.baixo, "center", 1, -5) + slider.baixo:SetSize (16, 16) + slider.baixo:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + slider.baixo:SetBackdropColor (0, 0, 0, 0.35) + slider.baixo:SetBackdropBorderColor (0, 0, 0, 1) + + slider.slider:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\AddOns\Details\images\background]]}) + slider.slider:SetBackdropColor (0, 0, 0, 0.35) + slider.slider:SetBackdropBorderColor (0, 0, 0, 1) + + --slider.slider:Altura (164) + slider.slider:cimaPoint (0, 13) + slider.slider:baixoPoint (0, -13) + slider.slider.thumb:SetTexture ([[Interface\AddOns\Details\images\icons2]]) + slider.slider.thumb:SetTexCoord (482/512, 492/512, 104/512, 120/512) + slider.slider.thumb:SetSize (12, 12) + slider.slider.thumb:SetVertexColor (0.6, 0.6, 0.6, 0.95) + else + + slider.ScrollBar.ScrollUpButton:SetNormalTexture ([[Interface\Buttons\Arrow-Up-Up]]) + slider.ScrollBar.ScrollUpButton:GetNormalTexture():SetTexCoord (0, 1, 0, 1) + slider.ScrollBar.ScrollUpButton:SetPushedTexture ([[Interface\Buttons\Arrow-Up-Down]]) + slider.ScrollBar.ScrollUpButton:GetPushedTexture():SetTexCoord (0, 1, 0, 1) + slider.ScrollBar.ScrollUpButton:SetDisabledTexture ([[Interface\Buttons\Arrow-Up-Disabled]]) + slider.ScrollBar.ScrollUpButton:GetDisabledTexture():SetTexCoord (0, 1, 0, 1) + + slider.ScrollBar.ScrollUpButton:SetSize (16, 16) + slider.ScrollBar.ScrollUpButton:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = "Interface\\Tooltips\\UI-Tooltip-Background"}) + slider.ScrollBar.ScrollUpButton:SetBackdropColor (0, 0, 0, 0.3) + slider.ScrollBar.ScrollUpButton:SetBackdropBorderColor (0, 0, 0, 1) + + slider.ScrollBar.ScrollUpButton:GetNormalTexture():ClearAllPoints() + slider.ScrollBar.ScrollUpButton:GetPushedTexture():ClearAllPoints() + slider.ScrollBar.ScrollUpButton:GetDisabledTexture():ClearAllPoints() + slider.ScrollBar.ScrollUpButton:GetNormalTexture():SetPoint ("center", slider.ScrollBar.ScrollUpButton, "center", 1, 1) + slider.ScrollBar.ScrollUpButton:GetPushedTexture():SetPoint ("center", slider.ScrollBar.ScrollUpButton, "center", 1, 1) + slider.ScrollBar.ScrollUpButton:GetDisabledTexture():SetPoint ("center", slider.ScrollBar.ScrollUpButton, "center", 1, 1) + + -- + + slider.ScrollBar.ScrollDownButton:SetNormalTexture ([[Interface\Buttons\Arrow-Down-Up]]) + slider.ScrollBar.ScrollDownButton:GetNormalTexture():SetTexCoord (0, 1, 0, 1) + slider.ScrollBar.ScrollDownButton:SetPushedTexture ([[Interface\Buttons\Arrow-Down-Down]]) + slider.ScrollBar.ScrollDownButton:GetPushedTexture():SetTexCoord (0, 1, 0, 1) + slider.ScrollBar.ScrollDownButton:SetDisabledTexture ([[Interface\Buttons\Arrow-Down-Disabled]]) + slider.ScrollBar.ScrollDownButton:GetDisabledTexture():SetTexCoord (0, 1, 0, 1) + + slider.ScrollBar.ScrollDownButton:SetSize (16, 16) + slider.ScrollBar.ScrollDownButton:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = "Interface\\Tooltips\\UI-Tooltip-Background"}) + slider.ScrollBar.ScrollDownButton:SetBackdropColor (0, 0, 0, 0.3) + slider.ScrollBar.ScrollDownButton:SetBackdropBorderColor (0, 0, 0, 1) + + slider.ScrollBar.ScrollDownButton:GetNormalTexture():ClearAllPoints() + slider.ScrollBar.ScrollDownButton:GetPushedTexture():ClearAllPoints() + slider.ScrollBar.ScrollDownButton:GetDisabledTexture():ClearAllPoints() + slider.ScrollBar.ScrollDownButton:GetNormalTexture():SetPoint ("center", slider.ScrollBar.ScrollDownButton, "center", 1, -5) + slider.ScrollBar.ScrollDownButton:GetPushedTexture():SetPoint ("center", slider.ScrollBar.ScrollDownButton, "center", 1, -5) + slider.ScrollBar.ScrollDownButton:GetDisabledTexture():SetPoint ("center", slider.ScrollBar.ScrollDownButton, "center", 1, -5) + + -- + slider.ScrollBar:SetPoint ("TOPLEFT", slider, "TOPRIGHT", 6, -16) + slider.ScrollBar:SetPoint ("BOTTOMLEFT", slider, "BOTTOMRIGHT", 6, 16 + (heightOffset and heightOffset*-1 or 0)) + + slider.ScrollBar.ThumbTexture:SetColorTexture (.5, .5, .5, .3) + slider.ScrollBar.ThumbTexture:SetSize (12, 8) + + -- + + slider.ScrollBar:SetBackdrop ({edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = "Interface\\Tooltips\\UI-Tooltip-Background"}) + slider.ScrollBar:SetBackdropColor (0, 0, 0, 0.35) + slider.ScrollBar:SetBackdropBorderColor (0, 0, 0, 1) + end +end --doo elsee \ No newline at end of file diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua index 3edf673c..4da487a4 100644 --- a/Libs/DF/panel.lua +++ b/Libs/DF/panel.lua @@ -3009,7 +3009,7 @@ local gframe_create_line = function (self) local timeline = f:CreateFontString (nil, "overlay", "GameFontNormal") timeline:SetPoint ("bottomright", f, "bottomright", -2, 0) - _detalhes:SetFontSize (timeline, 8) + DF:SetFontSize (timeline, 8) f.timeline = timeline return f diff --git a/boot.lua b/boot.lua index 3dc252b7..869e31f9 100644 --- a/boot.lua +++ b/boot.lua @@ -1,10 +1,10 @@ - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --> global name declaration _ = nil _detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0") - _detalhes.build_counter = 2899 --it's 2885 for release - _detalhes.userversion = "v7.0.3.2899" + _detalhes.build_counter = 2920 --it's 2885 for release + _detalhes.userversion = "v7.0.3.2920" _detalhes.realversion = 111 --core version _detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")" Details = _detalhes diff --git a/gumps/janela_info.lua b/gumps/janela_info.lua index 17aabc45..bd4ca4bb 100644 --- a/gumps/janela_info.lua +++ b/gumps/janela_info.lua @@ -2872,8 +2872,6 @@ function gump:CriaJanelaInfo() local refresh_comparison_box = function (self) --atualiza a scroll - --FauxScrollFrame_Update (self, math.max (self.tab.spells_amt, 10), 9, 15) - fill_compare_actors (self, self.tab.player, self.tab.players) FauxScrollFrame_Update (self, self.tab.spells_amt, 12, 15) self:Show() @@ -3963,11 +3961,12 @@ function gump:CriaJanelaInfo() frame1:SetScript ("OnVerticalScroll", function (self, offset) FauxScrollFrame_OnVerticalScroll (self, offset, 14, refresh_comparison_box) end) frame1:SetSize (spell_compare_frame_width[1], spell_compare_frame_height) frame1:SetPoint ("topleft", frame, "topleft", xLocation, yLocation) + _detalhes.gump:ReskinSlider (frame1) frame1:SetBackdrop (frame_backdrop) frame1:SetBackdropColor (unpack (frame_backdrop_color)) frame1:SetBackdropBorderColor (unpack (frame_backdrop_border_color)) - + frame1.bars = {} frame1.tab = tab frame1.tooltip = create_tooltip ("DetailsPlayerComparisonBox1Tooltip") @@ -3988,6 +3987,8 @@ function gump:CriaJanelaInfo() target1:SetScript ("OnVerticalScroll", function (self, offset) FauxScrollFrame_OnVerticalScroll (self, offset, 14, refresh_target_box) end) target1:SetSize (spell_compare_frame_width[1], target_compare_frame_height) target1:SetPoint ("topleft", frame1, "bottomleft", 0, -10) + _detalhes.gump:ReskinSlider (target1) + target1:SetBackdrop (frame_backdrop) target1:SetBackdropColor (unpack (frame_backdrop_color)) target1:SetBackdropBorderColor (unpack (frame_backdrop_border_color))