- Fix for the title bar encounter timer.

This commit is contained in:
Tercio
2015-09-16 00:51:13 -03:00
parent 8a62868b0e
commit 3eb6f854a9
6 changed files with 26 additions and 15 deletions
+1 -5
View File
@@ -11,8 +11,4 @@ move-folders:
Details/plugins/Details_DungeonInfo-Warlords: Details_DungeonInfo-Warlords
Details/plugins/Details_3DModelsPaths: Details_3DModelsPaths
Details/plugins/Details_RaidCheck: Details_RaidCheck
Details/plugins/Details_DpsTuning: Details_DpsTuning
required-dependencies:
- details_raidpowerbars
- details-legacy-raids-info
Details/plugins/Details_DpsTuning: Details_DpsTuning
+12 -2
View File
@@ -1,5 +1,5 @@
local major, minor = "DetailsFramework-1.0", 9
local major, minor = "DetailsFramework-1.0", 10
local DF, oldminor = LibStub:NewLibrary (major, minor)
if (not DF) then
@@ -8,6 +8,7 @@ if (not DF) then
end
DetailsFrameworkCanLoad = true
local SharedMedia = LibStub:GetLibrary ("LibSharedMedia-3.0")
local _type = type
local _unpack = unpack
@@ -188,6 +189,11 @@ function DF:SetFontSize (fontString, ...)
fontString:SetFont (fonte, max (...), flags)
end
function DF:SetFontFace (fontString, fontface)
local font = SharedMedia:Fetch ("font", fontface, true)
if (font) then
fontface = font
end
local _, size, flags = fontString:GetFont()
fontString:SetFont (fontface, size, flags)
end
@@ -540,7 +546,11 @@ end
local tn = tonumber
function DF:ParseColors (_arg1, _arg2, _arg3, _arg4)
if (_type (_arg1) == "table") then
_arg1, _arg2, _arg3, _arg4 = _unpack (_arg1)
if (not _arg1[1] and _arg1.r) then
_arg1, _arg2, _arg3, _arg4 = _arg1.r, _arg1.g, _arg1.b, _arg1.a
else
_arg1, _arg2, _arg3, _arg4 = _unpack (_arg1)
end
elseif (_type (_arg1) == "string") then
+7
View File
@@ -197,6 +197,9 @@ local APIBarFunctions
_object.statusbar:SetStatusBarColor (_value1, _value2, _value3, _value4)
_object._texture.original_colors = {_value1, _value2, _value3, _value4}
_object.timer_texture:SetVertexColor (_value1, _value2, _value3, _value4)
_object.timer_textureR:SetVertexColor (_value1, _value2, _value3, _value4)
return _object._texture:SetVertexColor (_value1, _value2, _value3, _value4)
end
--> icon
@@ -218,9 +221,11 @@ local APIBarFunctions
local _value1, _value2 = _unpack (_value)
_object._texture:SetTexture (_value1)
_object.timer_texture:SetTexture (_value1)
_object.timer_textureR:SetTexture (_value1)
if (_value2) then
_object._texture:SetTexCoord (_unpack (_value2))
_object.timer_texture:SetTexCoord (_unpack (_value2))
_object.timer_textureR:SetTexCoord (_unpack (_value2))
end
else
if (_value:find ("\\")) then
@@ -230,9 +235,11 @@ local APIBarFunctions
if (file) then
_object._texture:SetTexture (file)
_object.timer_texture:SetTexture (file)
_object.timer_textureR:SetTexture (file)
else
_object._texture:SetTexture (_value)
_object.timer_texture:SetTexture (_value)
_object.timer_textureR:SetTexture (_value)
end
end
end
+2 -4
View File
@@ -377,10 +377,8 @@ local NameLessSlider = 1
slider:SetBackdropBorderColor (unpack (slider.MyObject.onleave_backdrop_border_color))
end
if (slider.MyObject.have_tooltip) then
GameCooltip2:ShowMe (false)
end
GameCooltip2:ShowMe (false)
end
+3 -3
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -6585,7 +6585,7 @@ function _detalhes:CheckForTextTimeCounter (combat_start)
end
else
for _, instance in ipairs (_detalhes.tabela_instancias) do
if (_detalhes.instance_title_text_timer [instance.meu_id]) then
if (_detalhes.instance_title_text_timer [instance.meu_id] and instance.baseframe and instance:IsEnabled() and instance.menu_attribute_string) then
_detalhes:CancelTimer (_detalhes.instance_title_text_timer [instance.meu_id])
local current_text = instance.menu_attribute_string:GetText()
current_text = current_text:gsub ("%[.*%] ", "")