- RaidCheck (plugin): added an option to be able to use the report panel.
- You Are Not Prepared (plugin): added Auto Close the window, can be disabled through its options panel. - Vanguard (plugin): Added Options Panel. - Details! is now using 'LibWindow-1.1' to save and restore the positioning of the windows, bug might appear, please report if something weird happen. - Improved specialization detection in order to try detect spec changes. - Added options to change the brackets and the separator for dps/percent block. - Added options for show (or hide) totals, dps and percent amount. - Added Segments shortcut menu pressing Shift + Right click. - Fixed positioning after reopen a window previously closed on last logon. - Fixed enemies display where sometimes the bars were black instead of red. - Fixed few places where spec icons wasn't being used on. - Fixed avoidance panel on Player Details Window where sometimes was giving errors. - Fixed priest shadow and holy detection. - Fixed blood and unholy spec icons. - Fixed an issue with 'Always Show me' feature where it was showing the player on Enemies display.
This commit is contained in:
Tercio
+61
-63
@@ -209,8 +209,10 @@
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------------------------------
|
||||
--> LibWindow-1.1
|
||||
--this is the restore function from Libs\LibWindow-1.1\LibWindow-1.1.lua we can't schedule and we save it inside the instance without frame references.
|
||||
|
||||
--> LibWindow-1.1 by Mikk http://www.wowace.com/profiles/mikk/
|
||||
--> this is the restore function from Libs\LibWindow-1.1\LibWindow-1.1.lua.
|
||||
--> we can't schedule a new save after restoring, we save it inside the instance without frame references and always attach to UIparent.
|
||||
function _detalhes:RestoreLibWindow()
|
||||
local frame = self.baseframe
|
||||
if (frame) then
|
||||
@@ -241,8 +243,7 @@
|
||||
|
||||
--> Details: using UIParent always in order to not break the positioning when using AddonSkin with ElvUI.
|
||||
if not point then -- we have position, but no point, which probably means we're going from data stored by the addon itself before LibWindow was added to it. It was PROBABLY topleft->bottomleft anchored. Most do it that way.
|
||||
--frame:SetPoint("TOPLEFT", frame:GetParent(), "BOTTOMLEFT", x, y)
|
||||
frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", x, y)
|
||||
frame:SetPoint("TOPLEFT", UIParent, "BOTTOMLEFT", x, y) --frame:SetPoint("TOPLEFT", frame:GetParent(), "BOTTOMLEFT", x, y)
|
||||
-- make it compute a better attachpoint (on next update)
|
||||
--_detalhes:ScheduleTimer ("SaveLibWindow", 0.05, self)
|
||||
return
|
||||
@@ -254,66 +255,62 @@
|
||||
end
|
||||
end
|
||||
|
||||
--> LibWindow-1.1
|
||||
--this is the save function from Libs\LibWindow-1.1\LibWindow-1.1.lua, we save it inside the instance without frame references.
|
||||
function _detalhes:SaveLibWindow()
|
||||
local frame = self.baseframe
|
||||
if (frame) then
|
||||
local left = frame:GetLeft()
|
||||
if (not left) then
|
||||
return _detalhes:ScheduleTimer ("SaveLibWindow", 0.05, self)
|
||||
end
|
||||
|
||||
--tinsert (_detalhes.resize_debug, #_detalhes.resize_debug+1, "SAVING 1: " .. (self.libwindow.x or 0))
|
||||
|
||||
--> LibWindow-1.1 ----------------
|
||||
--local parent = frame:GetParent() or nilParent
|
||||
--> Details: we are always using UIParent here or the addon is broken when using AddonSkins for ElvUI.
|
||||
local parent = UIParent
|
||||
-- No, this won't work very well with frames that aren't parented to nil or UIParent
|
||||
local s = frame:GetScale()
|
||||
local left,top = frame:GetLeft()*s, frame:GetTop()*s
|
||||
local right,bottom = frame:GetRight()*s, frame:GetBottom()*s
|
||||
local pwidth, pheight = parent:GetWidth(), parent:GetHeight()
|
||||
|
||||
local x,y,point;
|
||||
if left < (pwidth-right) and left < abs((left+right)/2 - pwidth/2) then
|
||||
x = left;
|
||||
point="LEFT";
|
||||
elseif (pwidth-right) < abs((left+right)/2 - pwidth/2) then
|
||||
x = right-pwidth;
|
||||
point="RIGHT";
|
||||
else
|
||||
x = (left+right)/2 - pwidth/2;
|
||||
point="";
|
||||
end
|
||||
|
||||
if bottom < (pheight-top) and bottom < abs((bottom+top)/2 - pheight/2) then
|
||||
y = bottom;
|
||||
point="BOTTOM"..point;
|
||||
elseif (pheight-top) < abs((bottom+top)/2 - pheight/2) then
|
||||
y = top-pheight;
|
||||
point="TOP"..point;
|
||||
else
|
||||
y = (bottom+top)/2 - pheight/2;
|
||||
-- point=""..point;
|
||||
end
|
||||
|
||||
if point=="" then
|
||||
point = "CENTER"
|
||||
end
|
||||
----------------------------------------
|
||||
|
||||
self.libwindow.x = x
|
||||
self.libwindow.y = y
|
||||
self.libwindow.point = point
|
||||
self.libwindow.scale = scale
|
||||
|
||||
--tinsert (_detalhes.resize_debug, #_detalhes.resize_debug+1, "SAVING 2: " .. (self.libwindow.x or 0))
|
||||
|
||||
end
|
||||
end
|
||||
--> LibWindow-1.1 by Mikk http://www.wowace.com/profiles/mikk/
|
||||
--> this is the save function from Libs\LibWindow-1.1\LibWindow-1.1.lua.
|
||||
--> we need to make it save inside the instance object without frame references and also we must always use UIParent due to embed settings for ElvUI and LUI.
|
||||
|
||||
function _detalhes:SaveLibWindow()
|
||||
local frame = self.baseframe
|
||||
if (frame) then
|
||||
local left = frame:GetLeft()
|
||||
if (not left) then
|
||||
return _detalhes:ScheduleTimer ("SaveLibWindow", 0.05, self)
|
||||
end
|
||||
--> Details: we are always using UIParent here or the addon break when using Embeds.
|
||||
local parent = UIParent --local parent = frame:GetParent() or nilParent
|
||||
-- No, this won't work very well with frames that aren't parented to nil or UIParent
|
||||
local s = frame:GetScale()
|
||||
local left,top = frame:GetLeft()*s, frame:GetTop()*s
|
||||
local right,bottom = frame:GetRight()*s, frame:GetBottom()*s
|
||||
local pwidth, pheight = parent:GetWidth(), parent:GetHeight()
|
||||
|
||||
local x,y,point;
|
||||
if left < (pwidth-right) and left < abs((left+right)/2 - pwidth/2) then
|
||||
x = left;
|
||||
point="LEFT";
|
||||
elseif (pwidth-right) < abs((left+right)/2 - pwidth/2) then
|
||||
x = right-pwidth;
|
||||
point="RIGHT";
|
||||
else
|
||||
x = (left+right)/2 - pwidth/2;
|
||||
point="";
|
||||
end
|
||||
|
||||
if bottom < (pheight-top) and bottom < abs((bottom+top)/2 - pheight/2) then
|
||||
y = bottom;
|
||||
point="BOTTOM"..point;
|
||||
elseif (pheight-top) < abs((bottom+top)/2 - pheight/2) then
|
||||
y = top-pheight;
|
||||
point="TOP"..point;
|
||||
else
|
||||
y = (bottom+top)/2 - pheight/2;
|
||||
-- point=""..point;
|
||||
end
|
||||
|
||||
if point=="" then
|
||||
point = "CENTER"
|
||||
end
|
||||
|
||||
----------------------------------------
|
||||
--> save inside the instance object
|
||||
self.libwindow.x = x
|
||||
self.libwindow.y = y
|
||||
self.libwindow.point = point
|
||||
self.libwindow.scale = scale
|
||||
end
|
||||
end
|
||||
|
||||
--> end for libwindow-1.1
|
||||
--------------------------------------------------------------------------------------------------------
|
||||
|
||||
function _detalhes:SaveMainWindowSize()
|
||||
@@ -435,6 +432,7 @@
|
||||
function _detalhes:RestoreMainWindowPosition (pre_defined)
|
||||
|
||||
if (not pre_defined and self.libwindow.x and self.mostrando == "normal") then
|
||||
--if (not true and not pre_defined and self.libwindow.x and self.mostrando == "normal") then
|
||||
local s = self.window_scale
|
||||
self.baseframe:SetScale (s)
|
||||
self.rowframe:SetScale (s)
|
||||
|
||||
+183
-42
@@ -262,32 +262,178 @@ local _
|
||||
|
||||
--overwrites
|
||||
instance_cprops = {
|
||||
hide_icon = true,
|
||||
|
||||
menu_icons_size = 0.85,
|
||||
menu_anchor = {16, 1, side = 2},
|
||||
menu_anchor_down = {16, -2},
|
||||
|
||||
["menu_icons"] = {true, true, true, true, true, true, ["shadow"] = true, ["space"] = -3},
|
||||
|
||||
plugins_grow_direction = 1,
|
||||
|
||||
show_sidebars = false,
|
||||
show_statusbar = false,
|
||||
color = {.3, .3, .3, 0.80},
|
||||
bg_alpha = 0.2,
|
||||
|
||||
row_info = {
|
||||
texture = "BantoBar", --"Details Serenity"
|
||||
font_face = "Accidental Presidency",
|
||||
texture_background_class_color = false,
|
||||
texture_background = "Details Serenity",
|
||||
font_size = 11,
|
||||
fixed_texture_background_color = {0, 0, 0, 0.3186},
|
||||
icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]],
|
||||
start_after_icon = false,
|
||||
["menu_icons_size"] = 0.850000023841858,
|
||||
["color"] = {
|
||||
0.333333333333333, -- [1]
|
||||
0.333333333333333, -- [2]
|
||||
0.333333333333333, -- [3]
|
||||
0.3777777777777, -- [4]
|
||||
},
|
||||
attribute_text = {enabled = true, side = 1, text_size = 11, anchor = {-18, 5}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"},
|
||||
["menu_anchor"] = {
|
||||
16, -- [1]
|
||||
0, -- [2]
|
||||
["side"] = 2,
|
||||
},
|
||||
["bg_r"] = 0.0941176470588235,
|
||||
["color_buttons"] = {
|
||||
1, -- [1]
|
||||
1, -- [2]
|
||||
1, -- [3]
|
||||
1, -- [4]
|
||||
},
|
||||
["menu_anchor_down"] = {
|
||||
16, -- [1]
|
||||
-3, -- [2]
|
||||
},
|
||||
["attribute_text"] = {
|
||||
["enabled"] = true,
|
||||
["shadow"] = false,
|
||||
["side"] = 1,
|
||||
["text_size"] = 12,
|
||||
["custom_text"] = "{name}",
|
||||
["text_face"] = "Accidental Presidency",
|
||||
["anchor"] = {
|
||||
-18, -- [1]
|
||||
4, -- [2]
|
||||
},
|
||||
["text_color"] = {
|
||||
1, -- [1]
|
||||
1, -- [2]
|
||||
1, -- [3]
|
||||
1, -- [4]
|
||||
},
|
||||
["enable_custom_text"] = false,
|
||||
},
|
||||
["bg_alpha"] = 0.0984569266438484,
|
||||
["plugins_grow_direction"] = 1,
|
||||
["menu_icons"] = {
|
||||
true, -- [1]
|
||||
true, -- [2]
|
||||
true, -- [3]
|
||||
true, -- [4]
|
||||
true, -- [5]
|
||||
false, -- [6]
|
||||
["space"] = -4,
|
||||
["shadow"] = false,
|
||||
},
|
||||
["desaturated_menu"] = false,
|
||||
["micro_displays_side"] = 2,
|
||||
["statusbar_info"] = {
|
||||
["alpha"] = 0.622480094432831,
|
||||
["overlay"] = {
|
||||
0.333333333333333, -- [1]
|
||||
0.298039215686275, -- [2]
|
||||
0.337254901960784, -- [3]
|
||||
},
|
||||
},
|
||||
["hide_icon"] = true,
|
||||
["instance_button_anchor"] = {
|
||||
-27, -- [1]
|
||||
1, -- [2]
|
||||
},
|
||||
["toolbar_side"] = 1,
|
||||
["bg_g"] = 0.0941176470588235,
|
||||
["backdrop_texture"] = "Details Ground",
|
||||
["show_statusbar"] = false,
|
||||
["show_sidebars"] = false,
|
||||
["wallpaper"] = {
|
||||
["enabled"] = false,
|
||||
["texcoord"] = {
|
||||
0, -- [1]
|
||||
1, -- [2]
|
||||
0, -- [3]
|
||||
0.7, -- [4]
|
||||
},
|
||||
["overlay"] = {
|
||||
1, -- [1]
|
||||
1, -- [2]
|
||||
1, -- [3]
|
||||
1, -- [4]
|
||||
},
|
||||
["anchor"] = "all",
|
||||
["height"] = 114.042518615723,
|
||||
["alpha"] = 0.5,
|
||||
["width"] = 283.000183105469,
|
||||
},
|
||||
["stretch_button_side"] = 1,
|
||||
["row_info"] = {
|
||||
["textR_outline"] = false,
|
||||
["spec_file"] = "Interface\\AddOns\\Details\\images\\spec_icons_normal_alpha",
|
||||
["textL_outline"] = false,
|
||||
["texture_highlight"] = "Interface\\FriendsFrame\\UI-FriendsList-Highlight",
|
||||
["textR_show_data"] = {
|
||||
true, -- [1]
|
||||
true, -- [2]
|
||||
true, -- [3]
|
||||
},
|
||||
["textL_enable_custom_text"] = false,
|
||||
["fixed_text_color"] = {
|
||||
1, -- [1]
|
||||
1, -- [2]
|
||||
1, -- [3]
|
||||
},
|
||||
["space"] = {
|
||||
["right"] = 0,
|
||||
["left"] = 0,
|
||||
["between"] = 0,
|
||||
},
|
||||
["texture_background_class_color"] = false,
|
||||
["start_after_icon"] = false,
|
||||
["font_face_file"] = "Interface\\Addons\\Details\\fonts\\Accidental Presidency.ttf",
|
||||
["textL_custom_text"] = "{data1}. {data3}{data2}",
|
||||
["font_size"] = 10,
|
||||
["height"] = 14,
|
||||
["texture_file"] = "Interface\\AddOns\\Details\\images\\BantoBar",
|
||||
["icon_file"] = "Interface\\AddOns\\Details\\images\\classes_small_alpha",
|
||||
["textR_bracket"] = "(",
|
||||
["textR_enable_custom_text"] = false,
|
||||
["fixed_texture_color"] = {
|
||||
0, -- [1]
|
||||
0, -- [2]
|
||||
0, -- [3]
|
||||
},
|
||||
["textL_show_number"] = true,
|
||||
["textR_custom_text"] = "{data1} ({data2}, {data3}%)",
|
||||
["texture"] = "BantoBar",
|
||||
["use_spec_icons"] = true,
|
||||
["textR_class_colors"] = false,
|
||||
["textL_class_colors"] = false,
|
||||
["texture_background_file"] = "Interface\\AddOns\\Details\\images\\bar4_reverse",
|
||||
["texture_background"] = "Details D'ictum (reverse)",
|
||||
["alpha"] = 1,
|
||||
["no_icon"] = false,
|
||||
["percent_type"] = 1,
|
||||
["fixed_texture_background_color"] = {
|
||||
0, -- [1]
|
||||
0, -- [2]
|
||||
0, -- [3]
|
||||
0.150228589773178, -- [4]
|
||||
},
|
||||
["font_face"] = "Accidental Presidency",
|
||||
["texture_class_colors"] = true,
|
||||
["models"] = {
|
||||
["upper_model"] = "Spells\\AcidBreath_SuperGreen.M2",
|
||||
["lower_model"] = "World\\EXPANSION02\\DOODADS\\Coldarra\\COLDARRALOCUS.m2",
|
||||
["upper_alpha"] = 0.5,
|
||||
["lower_enabled"] = false,
|
||||
["lower_alpha"] = 0.1,
|
||||
["upper_enabled"] = false,
|
||||
},
|
||||
["fast_ps_update"] = false,
|
||||
["textR_separator"] = ",",
|
||||
["backdrop"] = {
|
||||
["enabled"] = false,
|
||||
["size"] = 12,
|
||||
["color"] = {
|
||||
1, -- [1]
|
||||
1, -- [2]
|
||||
1, -- [3]
|
||||
1, -- [4]
|
||||
},
|
||||
["texture"] = "Details BarBorder 2",
|
||||
},
|
||||
},
|
||||
["bg_b"] = 0.0941176470588235,
|
||||
},
|
||||
|
||||
callback = function (skin, instance, just_updating)
|
||||
@@ -1184,11 +1330,6 @@ local _
|
||||
["color"] = {1,1,1,1},
|
||||
["menu_anchor"] = {17, 2, ["side"] = 2},
|
||||
["bg_r"] = 0.517647058823529,
|
||||
["following"] = {
|
||||
["enabled"] = false,
|
||||
["bar_color"] = {1,1,1},
|
||||
["text_color"] = {1,1,1},
|
||||
},
|
||||
["color_buttons"] = {1,1,1,1},
|
||||
["bars_sort_direction"] = 1,
|
||||
["instance_button_anchor"] = {-27,1},
|
||||
@@ -1205,7 +1346,7 @@ local _
|
||||
["percent_type"] = 1,
|
||||
["fixed_text_color"] = {0.905882352941177,0.905882352941177,0.905882352941177,1},
|
||||
["space"] = {
|
||||
["right"] = -2,
|
||||
["right"] = -3,
|
||||
["left"] = 1,
|
||||
["between"] = 1,
|
||||
},
|
||||
@@ -1216,13 +1357,13 @@ local _
|
||||
["alpha"] = 1,
|
||||
["textR_class_colors"] = false,
|
||||
["models"] = {
|
||||
["upper_model"] = "Spells\\AcidBreath_SuperGreen.M2",
|
||||
["lower_model"] = "World\\EXPANSION02\\DOODADS\\Coldarra\\COLDARRALOCUS.m2",
|
||||
["upper_alpha"] = 0.5,
|
||||
["lower_enabled"] = false,
|
||||
["lower_alpha"] = 0.1,
|
||||
["upper_enabled"] = false,
|
||||
},
|
||||
["upper_model"] = "Spells\\AcidBreath_SuperGreen.M2",
|
||||
["lower_model"] = "World\\EXPANSION02\\DOODADS\\Coldarra\\COLDARRALOCUS.m2",
|
||||
["upper_alpha"] = 0.5,
|
||||
["lower_enabled"] = false,
|
||||
["lower_alpha"] = 0.1,
|
||||
["upper_enabled"] = false,
|
||||
},
|
||||
["backdrop"] = {
|
||||
["enabled"] = false,
|
||||
["size"] = 5,
|
||||
@@ -1234,7 +1375,7 @@ local _
|
||||
["no_icon"] = false,
|
||||
["font_size"] = 10,
|
||||
["textL_class_colors"] = false,
|
||||
["font_face"] = "Arial Narrow",
|
||||
["font_face"] = "FORCED SQUARE",
|
||||
["texture_class_colors"] = true,
|
||||
["height"] = 14,
|
||||
["texture_file"] = "Interface\\AddOns\\Details\\images\\bar_skyline",
|
||||
@@ -1274,7 +1415,7 @@ local _
|
||||
},
|
||||
["hide_icon"] = true,
|
||||
["micro_displays_side"] = 2,
|
||||
["bg_alpha"] = 0.659999966621399,
|
||||
["bg_alpha"] = 1,
|
||||
["auto_current"] = true,
|
||||
["toolbar_side"] = 1,
|
||||
["bg_g"] = 0.517647058823529,
|
||||
@@ -1299,8 +1440,8 @@ local _
|
||||
["side"] = 1,
|
||||
["enable_custom_text"] = false,
|
||||
["custom_text"] = "{name}",
|
||||
["text_face"] = "Accidental Presidency",
|
||||
["anchor"] = {-18,5},
|
||||
["text_face"] = "FORCED SQUARE",
|
||||
["anchor"] = {-18, 6},
|
||||
["text_color"] = {1,1,1,0.7},
|
||||
["text_size"] = 12,
|
||||
},
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -849,11 +849,12 @@ local function CreatePluginFrames()
|
||||
|
||||
local player_dps = DpsTuningPlugin.CurCombat:GetTimeData ("Player Damage Done")
|
||||
|
||||
chart_panel:SetTime (DpsTuningPlugin.CurCombat:GetCombatTime())
|
||||
local combat_time = DpsTuningPlugin.CurCombat:GetCombatTime()
|
||||
chart_panel:SetTime (combat_time)
|
||||
chart_panel:SetScale (player_dps.max_value)
|
||||
|
||||
chart_panel:AddLine (player_dps, {1, 1, 1, 1}, "Your Damage", "line")
|
||||
chart_panel:AddLine (power_amount_chart_table, {1, .4, .4, 1}, "Spell/Attack Power (x3)")
|
||||
chart_panel:AddLine (player_dps, {1, 1, 1, 1}, "Your Damage", combat_time, "line")
|
||||
chart_panel:AddLine (power_amount_chart_table, {1, .4, .4, 1}, "Spell/Attack Power (x3)", combat_time)
|
||||
|
||||
chart_panel:Show()
|
||||
end
|
||||
@@ -919,7 +920,7 @@ local function CreatePluginFrames()
|
||||
|
||||
if (spelldamage/player_total_damage*100 > 5) then
|
||||
if (colors [index]) then
|
||||
chart_panel:AddLine (chart_data, colors [index], spellname, nil, GraphicSmoothLevel)
|
||||
chart_panel:AddLine (chart_data, colors [index], spellname, DpsTuningPlugin.CurCombat:GetCombatTime(), nil, GraphicSmoothLevel)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -935,7 +936,7 @@ local function CreatePluginFrames()
|
||||
chart_panel:Reset()
|
||||
|
||||
local player_dps = DpsTuningPlugin.CurCombat:GetTimeData ("Player Damage Done")
|
||||
chart_panel:AddLine (player_dps, {1, 1, 1, 1}, "Your Damage", "line")
|
||||
chart_panel:AddLine (player_dps, {1, 1, 1, 1}, "Your Damage", DpsTuningPlugin.CurCombat:GetCombatTime(), "line")
|
||||
|
||||
chart_panel:SetTime (DpsTuningPlugin.CurCombat:GetCombatTime())
|
||||
chart_panel:SetScale (player_dps.max_value)
|
||||
|
||||
Reference in New Issue
Block a user