- Details! is ready for Uldir mythic raiding!.
- Details! Scroll Damage for training in dummies is now ready for more tests, access it /details scrolldamage. - Damage and Healing tooltips now show a statusbar indicating the percent done by the ability. - Added a scale slider to the options panel. - Added monk's Quaking Palm to crowd control spells. - Fixed an issue with Plater integration. - Fixed tooltips not hiding when the cursor leaves the spell icon in the Damage Taken by Spell. - Framework: fixed an issue with tooltips and menus where the division line wasn't hiding properly. - Framework: fixed some buttons not showing its text in the options panel.
This commit is contained in:
+25
-5
@@ -1165,6 +1165,8 @@ function DF:NewFillPanel (parent, rows, name, member, w, h, total_lines, fill_ro
|
||||
panel.scrollframe = scrollframe
|
||||
scrollframe.lines = {}
|
||||
|
||||
DF:ReskinSlider (scrollframe)
|
||||
|
||||
--create lines
|
||||
function panel:UpdateRowAmount()
|
||||
local size = options.rowheight
|
||||
@@ -4815,7 +4817,7 @@ DF.IconRowFunctions = {
|
||||
newIconFrame:SetBackdropBorderColor (0, 0, 0, 0)
|
||||
newIconFrame:EnableMouse (false)
|
||||
|
||||
local cooldownFrame = CreateFrame ("cooldown", "$parentIconCooldown" .. self.NextIcon, self, "CooldownFrameTemplate")
|
||||
local cooldownFrame = CreateFrame ("cooldown", "$parentIconCooldown" .. self.NextIcon, newIconFrame, "CooldownFrameTemplate")
|
||||
cooldownFrame:SetAllPoints()
|
||||
cooldownFrame:EnableMouse (false)
|
||||
|
||||
@@ -4823,6 +4825,10 @@ DF.IconRowFunctions = {
|
||||
newIconFrame.Text:SetPoint ("center")
|
||||
newIconFrame.Text:Hide()
|
||||
|
||||
newIconFrame.Desc = newIconFrame:CreateFontString (nil, "overlay", "GameFontNormal")
|
||||
newIconFrame.Desc:SetPoint ("bottom", newIconFrame, "top", 0, 2)
|
||||
newIconFrame.Desc:Hide()
|
||||
|
||||
newIconFrame.Cooldown = cooldownFrame
|
||||
|
||||
self.IconPool [self.NextIcon] = newIconFrame
|
||||
@@ -4858,7 +4864,7 @@ DF.IconRowFunctions = {
|
||||
return iconFrame
|
||||
end,
|
||||
|
||||
SetIcon = function (self, spellId, borderColor, startTime, duration, forceTexture)
|
||||
SetIcon = function (self, spellId, borderColor, startTime, duration, forceTexture, descText)
|
||||
|
||||
local spellName, _, spellIcon
|
||||
|
||||
@@ -4878,20 +4884,30 @@ DF.IconRowFunctions = {
|
||||
else
|
||||
iconFrame:SetBackdropBorderColor (0, 0, 0 ,0)
|
||||
end
|
||||
|
||||
|
||||
if (startTime) then
|
||||
CooldownFrame_Set (iconFrame.Cooldown, startTime, duration, true, true)
|
||||
|
||||
if (self.options.show_text) then
|
||||
iconFrame.Text:Show()
|
||||
iconFrame.Text:SetText (floor (startTime + duration - GetTime()))
|
||||
|
||||
else
|
||||
iconFrame.Text:Hide()
|
||||
end
|
||||
else
|
||||
iconFrame.Text:Hide()
|
||||
end
|
||||
|
||||
|
||||
if (descText and self.options.desc_text) then
|
||||
iconFrame.Desc:Show()
|
||||
iconFrame.Desc:SetText (descText.text)
|
||||
iconFrame.Desc:SetTextColor (DF:ParseColors (descText.text_color or self.options.desc_text_color))
|
||||
DF:SetFontSize (iconFrame.Desc, descText.text_size or self.options.desc_text_size)
|
||||
else
|
||||
iconFrame.Desc:Hide()
|
||||
end
|
||||
|
||||
iconFrame:SetSize (self.options.icon_width, self.options.icon_height)
|
||||
iconFrame:Show()
|
||||
|
||||
@@ -4958,10 +4974,13 @@ local default_icon_row_options = {
|
||||
texcoord = {.1, .9, .1, .9},
|
||||
show_text = true,
|
||||
text_color = {1, 1, 1, 1},
|
||||
desc_text = true,
|
||||
desc_text_color = {1, 1, 1, 1},
|
||||
desc_text_size = 7,
|
||||
left_padding = 1, --distance between right and left
|
||||
top_padding = 1, --distance between top and bottom
|
||||
icon_padding = 1, --distance between each icon
|
||||
backdrop = {edgeFile = [[Interface\Buttons\WHITE8X8]], edgeSize = 1, bgFile = [[Interface\Tooltips\UI-Tooltip-Background]], tileSize = 64, tile = true},
|
||||
backdrop = {},
|
||||
backdrop_color = {0, 0, 0, 0.5},
|
||||
backdrop_border_color = {0, 0, 0, 1},
|
||||
anchor = {side = 6, x = 2, y = 0},
|
||||
@@ -4979,6 +4998,7 @@ function DF:CreateIconRow (parent, name, options)
|
||||
f:BuildOptionsTable (default_icon_row_options, options)
|
||||
|
||||
f:SetSize (f.options.icon_width, f.options.icon_height + (f.options.top_padding * 2))
|
||||
|
||||
f:SetBackdrop (f.options.backdrop)
|
||||
f:SetBackdropColor (unpack (f.options.backdrop_color))
|
||||
f:SetBackdropBorderColor (unpack (f.options.backdrop_border_color))
|
||||
|
||||
Reference in New Issue
Block a user