- Fixed an issue with bookmarks panel not opening correctly.

This commit is contained in:
Tercio
2015-08-04 15:37:47 -03:00
parent dd0f6d33cb
commit 668d509e29
5 changed files with 51 additions and 8 deletions
+5 -7
View File
File diff suppressed because one or more lines are too long
+8
View File
@@ -286,6 +286,14 @@ function _detalhes:LoadConfig()
_detalhes.switch.slots = _detalhes_global.switchSaved.slots
_detalhes.switch.table = _detalhes_global.switchSaved.table
if (_detalhes.switch.table) then
for i = 1, #_detalhes.switch.table do
if (not _detalhes.switch.table [i]) then
_detalhes.switch.table [i] = {}
end
end
end
--> last boss
_detalhes.last_encounter = _detalhes_database.last_encounter
+4 -1
View File
@@ -2518,7 +2518,10 @@ function window:CreateFrame17()
{value = 1, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_1"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_03", texcoord = {1, 0, 0, 1}, color = "gray"},
{value = 2, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_2"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 3, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_3"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 4, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_4"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}}
{value = 4, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_4"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 5, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_5"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 6, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_6"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}},
{value = 7, label = Loc ["STRING_OPTIONS_COMBAT_ALPHA_7"], onclick = onSelectCombatAlpha, icon = "Interface\\Icons\\INV_Misc_Spyglass_02", texcoord = {1, 0, 0, 1}, desc = Loc ["STRING_OPTIONS_COMBAT_ALPHA_6"] .. " + " .. Loc ["STRING_OPTIONS_COMBAT_ALPHA_3"]},
}
local buildTypeCombatAlpha = function()
return typeCombatAlpha
+30
View File
@@ -6157,6 +6157,18 @@ function _detalhes:DelayedCheckOutOfCombatAlpha (instance)
end
end
function _detalhes:DelayedCheckOutOfCombatAndGroupAlpha (instance)
if ((_detalhes.zone_type == "raid" or _detalhes.zone_type == "party") and IsInInstance()) then
if (UnitAffectingCombat ("player") or InCombatLockdown()) then
instance:SetWindowAlphaForCombat (true, true) --> hida a janela
else
instance:SetWindowAlphaForCombat (false) --> deshida a janela
end
else
instance:SetWindowAlphaForCombat (true, true) --> hida a janela
end
end
function _detalhes:SetCombatAlpha (modify_type, alpha_amount, interacting)
if (interacting) then
@@ -6176,6 +6188,24 @@ function _detalhes:SetCombatAlpha (modify_type, alpha_amount, interacting)
else
self:SetWindowAlphaForCombat (true, true) --> hida a janela
end
elseif (self.hide_in_combat_type == 5) then --"While Not Inside Instance"
if ((_detalhes.zone_type == "raid" or _detalhes.zone_type == "party") and IsInInstance()) then
self:SetWindowAlphaForCombat (true, true) --> hida a janela
else
self:SetWindowAlphaForCombat (false) --> deshida a janela
end
elseif (self.hide_in_combat_type == 6) then --"While Inside Instance"
if ((_detalhes.zone_type == "raid" or _detalhes.zone_type == "party") and IsInInstance()) then
self:SetWindowAlphaForCombat (false) --> deshida a janela
else
self:SetWindowAlphaForCombat (true, true) --> hida a janela
end
elseif (self.hide_in_combat_type == 7) then --"Raid Debug" = Out of Combat and Inside Raid or Dungeon
_detalhes:ScheduleTimer ("DelayedCheckOutOfCombatAndGroupAlpha", 0.3, self)
end
return
+4
View File
@@ -525,6 +525,10 @@ function _detalhes.switch:ShowMe (instancia)
local precisa_mostrar = 0
for i = 1, #_detalhes.switch.table do
local slot = _detalhes.switch.table [i]
if (not slot) then
_detalhes.switch.table [i] = {}
slot = _detalhes.switch.table [i]
end
if (slot.atributo) then
precisa_mostrar = precisa_mostrar + 1
else