Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

Added Click Through and 8.2 Bug Fixes

Browse Source 
- Added click through option in options > display section.
- Fixed code editor for bar texts not opening.
- General small bug fixes.
This commit is contained in:
Tercioo
2019-07-02 18:50:14 -03:00
parent 2018078d4b
commit 04f621d78e
6 changed files with 301 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boot.lua
+8 -6
View File
File diff suppressed because one or more lines are too long
classes/classe_instancia_include.lua
+6
View File
@@ -91,6 +91,12 @@ end
_detalhes.instance_defaults = {
--> click through settings
clickthrough_toolbaricons = false,
clickthrough_rows = false,
clickthrough_window = false,
clickthrough_incombatonly = true,
--> window settings
ignore_mass_showhide = false,
--skin
core/windows.lua
+1
View File
@@ -3044,6 +3044,7 @@
function panel:Open (text, callback, host, default)
if (host) then
panel:ClearAllPoints()
panel:SetPoint ("center", host, "center")
end
functions/link.lua
+3
View File
@@ -2113,6 +2113,8 @@
local iconsize = {14, 14}
local game_sounds = {
--8.2 broke file paths, removing them until a way of converting to soundIds is possible
--[=[
["Horde Banner Down"] = [[Sound\event\EVENT_VashjirIntro_HordeBannerDown_01.ogg]],
["Mast Crack"] = [[Sound\event\EVENT_VashjirIntro_MastCrack_01.ogg]],
["Orc Attack "] = [[Sound\event\EVENT_VashjirIntro_OrcAttackVox_03.ogg]],
@@ -2138,6 +2140,7 @@
["Beat 02"] = [[Sound\DOODAD\GO_PA_Kungfugear_bag_Left04.OGG]],
["Water Drop"] = [[Sound\DOODAD\Hellfire_DW_Pipe_Type4_01.ogg]],
["Frog"] = [[Sound\EMITTERS\Emitter_Dalaran_Petstore_Frog_01.ogg]],
--]=]
}
local sound_options = function()
gumps/janela_options.lua
+100 -22
View File
@@ -3984,7 +3984,7 @@ function window:CreateFrame1()
frame1.chooseAvatarButton:SetTextColor (button_color_rgb)
g:NewLabel (frame1, _, "$parentChooseAvatarLabel", "ChooseAvatarLabel", Loc ["STRING_OPTIONS_AVATAR"], "GameFontHighlightLeft")
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -50, -25)
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -50, -35)
frame1.ChooseAvatarLabel:SetTextColor (button_color_rgb)
--> avatar preview
@@ -4016,16 +4016,16 @@ function window:CreateFrame1()
return true
end)
frame1.chooseAvatarButton:SetHook ("OnMouseDown", function()
frame1.avatarPreview:SetPoint (avatar_x_anchor2+2, -158)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+2, -160)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+110, -192)
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -49, -26)
frame1.avatarPreview:SetPoint (avatar_x_anchor2+2, -138)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+2, -140)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+110, -172)
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -49, -36)
end)
frame1.chooseAvatarButton:SetHook ("OnMouseUp", function()
frame1.avatarPreview:SetPoint (avatar_x_anchor2+1, -157)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+1, -159)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+109, -191)
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -50, -25)
frame1.avatarPreview:SetPoint (avatar_x_anchor2+1, -137)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+1, -139)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+109, -171)
frame1.ChooseAvatarLabel:SetPoint ("topright", frame1.chooseAvatarButton, "topright", -50, -35)
end)
--window:CreateLineBackground2 (frame1, "chooseAvatarButton", "chooseAvatarButton", Loc ["STRING_OPTIONS_AVATAR_DESC"], nil, {1, 0.8, 0}, button_color_rgb)
@@ -4270,7 +4270,7 @@ function window:CreateFrame1()
frame1.CreateWindowButton:SetIcon ([[Interface\Buttons\UI-AttributeButton-Encourage-Up]], nil, nil, nil, nil, nil, nil, 2)
frame1.CreateWindowButton:SetTextColor (button_color_rgb)
--set color
--set window color
local windowcolor_callback = function (button, r, g, b, a)
local instance = _G.DetailsOptionsWindow.instance
@@ -4356,6 +4356,72 @@ function window:CreateFrame1()
frame1.ClassColorsButton:SetIcon ([[Interface\AddOns\Details\images\icons]], nil, nil, nil, {430/512, 459/512, 4/512, 30/512}, nil, nil, 2) -- , "orange"
frame1.ClassColorsButton:SetTextColor (button_color_rgb)
--click through ~clickthrough
--in combat only
g:NewLabel (frame1, _, "$parentclickThroughInCombatLabel", "clickThroughInCombatLabel", "In Combat Only", "GameFontHighlightLeft")
g:NewSwitch (frame1, _, "$parentclickThroughInCombatSlider", "clickThroughInCombatSlider", 60, 20, _, _, _G.DetailsOptionsWindow.instance.clickthrough_incombatonly, nil, nil, nil, nil, options_switch_template)
frame1.clickThroughInCombatSlider:SetAsCheckBox()
frame1.clickThroughInCombatSlider:SetPoint ("left", frame1.clickThroughInCombatLabel, "right", 2, 0)
frame1.clickThroughInCombatSlider.OnSwitch = function (self, _, value) --> slider, fixedValue, sliderValue (false, true)
_G.DetailsOptionsWindow.instance:UpdateClickThroughSettings (value)
if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then
for _, this_instance in ipairs (_G.DetailsOptionsWindow.instance:GetInstanceGroup()) do
if (this_instance ~= _G.DetailsOptionsWindow.instance) then
this_instance:UpdateClickThroughSettings (value)
end
end
end
end
window:CreateLineBackground2 (frame1, "clickThroughInCombatSlider", "clickThroughInCombatLabel", "Only apply click through when in combat.")
--window
g:NewLabel (frame1, _, "$parentclickThroughWindowLabel", "clickThroughWindowLabel", "Affect Window", "GameFontHighlightLeft")
g:NewSwitch (frame1, _, "$parentclickThroughWindowSlider", "clickThroughWindowSlider", 60, 20, _, _, _G.DetailsOptionsWindow.instance.clickthrough_window, nil, nil, nil, nil, options_switch_template)
frame1.clickThroughWindowSlider:SetAsCheckBox()
frame1.clickThroughWindowSlider:SetPoint ("left", frame1.clickThroughWindowLabel, "right", 2, 0)
frame1.clickThroughWindowSlider.OnSwitch = function (self, _, value) --> slider, fixedValue, sliderValue (false, true)
_G.DetailsOptionsWindow.instance:UpdateClickThroughSettings (nil, value)
if (_detalhes.options_group_edit and not DetailsOptionsWindow.loading_settings) then
for _, this_instance in ipairs (_G.DetailsOptionsWindow.instance:GetInstanceGroup()) do
if (this_instance ~= _G.DetailsOptionsWindow.instance) then
this_instance:UpdateClickThroughSettings (nil, value)
end
end
end
end
window:CreateLineBackground2 (frame1, "clickThroughWindowSlider", "clickThroughWindowLabel", "The window will be click through.")
--bars
g:NewLabel (frame1, _, "$parentclickThroughBarsLabel", "clickThroughBarsLabel", "Affect Bars", "GameFontHighlightLeft")
g:NewSwitch (frame1, _, "$parentclickThroughBarsSlider", "clickThroughBarsSlider", 60, 20, _, _, _G.DetailsOptionsWindow.instance.clickthrough_rows, nil, nil, nil, nil, options_switch_template)
frame1.clickThroughBarsSlider:SetAsCheckBox()
frame1.clickThroughBarsSlider:SetPoint ("left", frame1.clickThroughBarsLabel, "right", 2, 0)
frame1.clickThroughBarsSlider.OnSwitch = function (self, _, value) --> slider, fixedValue, sliderValue (false, true)
_G.DetailsOptionsWindow.instance:UpdateClickThroughSettings (nil, nil, value)
if (_detalhes.options_group_edit and not _G.DetailsOptionsWindow.loading_settings) then
for _, this_instance in ipairs (_G.DetailsOptionsWindow.instance:GetInstanceGroup()) do
if (this_instance ~= _G.DetailsOptionsWindow.instance) then
this_instance:UpdateClickThroughSettings (nil, nil, value)
end
end
end
end
window:CreateLineBackground2 (frame1, "clickThroughBarsSlider", "clickThroughBarsLabel", "Player bars will be click through, won't show tooltips when hover hover them.")
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--> Time Type
@@ -4394,6 +4460,8 @@ function window:CreateFrame1()
g:NewLabel (frame1, _, "$parentWindowControlsAnchor", "WindowControlsLabel", Loc ["STRING_OPTIONS_WC_ANCHOR"], "GameFontNormal")
g:NewLabel (frame1, _, "$parentToolsAnchor", "ToolsLabel", Loc ["STRING_OPTIONS_TOOLS_ANCHOR"], "GameFontNormal")
g:NewLabel (frame1, _, "$parentClickThroughAnchor", "clickThroughLabel", "Click Through", "GameFontNormal")
local w_start = 10
@@ -4405,22 +4473,20 @@ function window:CreateFrame1()
frame1.GeneralIdentityLabel:SetPoint (avatar_x_anchor, window.top_start_at)
frame1.nicknameLabel:SetPoint (avatar_x_anchor, -115)
frame1.chooseAvatarButton:SetPoint (avatar_x_anchor+1, -140)
frame1.chooseAvatarButton:SetPoint (avatar_x_anchor+1, -115)
frame1.avatarPreview:SetPoint (avatar_x_anchor2+1, -157)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+1, -159)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+109, -191)
frame1.avatarPreview:SetPoint (avatar_x_anchor2+1, -137)
frame1.avatarPreview2:SetPoint (avatar_x_anchor2+1, -139)
frame1.avatarNickname:SetPoint (avatar_x_anchor2+109, -171)
frame1.IgnoreNicknamesLabel:SetPoint (avatar_x_anchor, -235)
frame1.realmNameLabel:SetPoint (avatar_x_anchor, -255)
frame1.IgnoreNicknamesLabel:SetPoint (avatar_x_anchor, -215)
frame1.realmNameLabel:SetPoint (avatar_x_anchor, -235)
--frame1.ToolsLabel:SetPoint (avatar_x_anchor, -265)
--frame1.EraseDataLabel:SetPoint (avatar_x_anchor, -290)
--frame1.BookmarkButton:SetPoint (avatar_x_anchor, -315)
--frame1.ClassColorsButton:SetPoint (avatar_x_anchor, -340)
local x = avatar_x_anchor
local right_side = {
@@ -4428,11 +4494,16 @@ function window:CreateFrame1()
{"LockButton", 2},
{"CloseButton", 3},
{"BreakSnapButton", 4},
{"SetWindowColorButton", 5},
{"CreateWindowButton", 6, true},
--{"SetWindowColorButton", 5},
{"CreateWindowButton", 6}, --, true
{"clickThroughLabel", 14, true},
{"clickThroughInCombatLabel", 15},
{"clickThroughWindowLabel", 16},
{"clickThroughBarsLabel", 17},
}
window:arrange_menu (frame1, right_side, x, -285)
window:arrange_menu (frame1, right_side, x, -265)
local left_side = {
{"GeneralAnchorLabel", 1, true},
@@ -4453,6 +4524,9 @@ function window:CreateFrame1()
{frame1.BookmarkButton, 12},
{frame1.ClassColorsButton, 13},
--{"WindowControlsLabel", 9, true},
--{"LockButton", 10},
--{"CloseButton", 11},
@@ -11276,7 +11350,7 @@ end --> if not window
_G.DetailsOptionsWindow1AbbreviateDropdown.MyObject:Select (_detalhes.ps_abbreviation)
_G.DetailsOptionsWindow1SliderUpdateSpeed.MyObject:SetValue (_detalhes.update_speed)
_G.DetailsOptionsWindow1AnimateSlider.MyObject:SetValue (_detalhes.use_row_animations)
_G.DetailsOptionsWindow1WindowControlsAnchor:SetText (string.format (Loc ["STRING_OPTIONS_WC_ANCHOR"], editing_instance.meu_id))
_G.DetailsOptionsWindow1EraseDataDropdown.MyObject:Select (_detalhes.segments_auto_erase)
@@ -11290,6 +11364,10 @@ end --> if not window
else
_G.DetailsOptionsWindow1LockButton.MyObject:SetText (Loc ["STRING_OPTIONS_WC_LOCK"])
end
_G.DetailsOptionsWindow1clickThroughInCombatSlider.MyObject:SetValue (editing_instance.clickthrough_incombatonly)
_G.DetailsOptionsWindow1clickThroughWindowSlider.MyObject:SetValue (editing_instance.clickthrough_window)
_G.DetailsOptionsWindow1clickThroughBarsSlider.MyObject:SetValue (editing_instance.clickthrough_rows)
end
_G.DetailsOptionsWindow1BreakSnapButton.MyObject:Disable()
gumps/janela_principal.lua
+183 -2
View File
@@ -3478,6 +3478,7 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
backgrounddisplay:SetFrameLevel (3)
backgroundframe.instance = instancia
backgrounddisplay.instance = instancia
instancia.backgroundDisplay = backgrounddisplay
--> row frame is the parent of rows, it have setallpoints on baseframe
local rowframe = CreateFrame ("frame", "DetailsRowFrame"..ID, _UIParent)
@@ -3494,6 +3495,8 @@ function gump:CriaJanelaPrincipal (ID, instancia, criando)
switchbutton:SetPoint ("bottomright", backgrounddisplay, "bottomright")
switchbutton:SetFrameLevel (backgrounddisplay:GetFrameLevel()+1)
instancia.switchButton = switchbutton
--> avoid mouse hover over a high window when the menu is open for a lower instance.
local anti_menu_overlap = CreateFrame ("frame", "Details_WindowFrameAntiMenuOverlap" .. ID, UIParent)
anti_menu_overlap:SetSize (100, 13)
@@ -4829,6 +4832,9 @@ function _detalhes:InstanceRefreshRows (instancia)
end
self:SetBarGrowDirection()
self:UpdateClickThrough()
end
@@ -7028,13 +7034,14 @@ function _detalhes:ChangeSkin (skin_name)
self.break_snap_button:SetPushedTexture (skin_file)
--> update toolbar icons
local toolbar_buttons = {}
do
local toolbar_icon_file = self.toolbar_icon_file
if (not toolbar_icon_file) then
toolbar_icon_file = [[Interface\AddOns\Details\images\toolbar_icons]]
end
local toolbar_buttons = {}
toolbar_buttons [1] = self.baseframe.cabecalho.modo_selecao
toolbar_buttons [2] = self.baseframe.cabecalho.segmento
toolbar_buttons [3] = self.baseframe.cabecalho.atributo
@@ -7210,9 +7217,183 @@ function _detalhes:ChangeSkin (skin_name)
self.bgframe.skin = this_skin
end
end
self:UpdateClickThrough()
end
--update the window click through state
local updateClickThroughListener = _detalhes:CreateEventListener()
function updateClickThroughListener:EnterCombat()
_detalhes:InstanceCall (function (instance)
C_Timer.After (1.5, function()
instance:UpdateClickThrough()
end)
end)
end
function updateClickThroughListener:LeaveCombat()
_detalhes:InstanceCall (function (instance)
C_Timer.After (1.5, function()
instance:UpdateClickThrough()
end)
end)
end
updateClickThroughListener:RegisterEvent ("COMBAT_PLAYER_ENTER", "EnterCombat")
updateClickThroughListener:RegisterEvent ("COMBAT_PLAYER_LEAVE", "EnterCombat")
function _detalhes:UpdateClickThroughSettings (inCombat, window, bars, toolbaricons)
if (inCombat ~= nil) then
self.clickthrough_incombatonly = inCombat
end
if (window ~= nil) then
self.clickthrough_window = window
end
if (bars ~= nil) then
self.clickthrough_rows = bars
end
if (toolbaricons ~= nil) then
self.clickthrough_toolbaricons = toolbaricons
end
self:UpdateClickThrough()
end
function _detalhes:UpdateClickThrough()
local barsClickThrough = self.clickthrough_rows
local windowClickThrough = self.clickthrough_window
local onlyInCombat = self.clickthrough_incombatonly
local toolbarIcons = not self.clickthrough_toolbaricons
if (onlyInCombat) then
if (InCombatLockdown()) then
--player bars
if (barsClickThrough) then
for barIndex, barObject in _ipairs (self.barras) do
barObject:EnableMouse (false)
end
else
for barIndex, barObject in _ipairs (self.barras) do
barObject:EnableMouse (true)
end
end
--window frames
if (windowClickThrough) then
self.baseframe:EnableMouse (false)
self.bgframe:EnableMouse (false)
self.rowframe:EnableMouse (false)
self.floatingframe:EnableMouse (false)
self.switchButton:EnableMouse (false)
self.backgroundDisplay:EnableMouse (false)
self.baseframe.UPFrame:EnableMouse (false)
else
self.baseframe:EnableMouse (true)
self.bgframe:EnableMouse (true)
self.rowframe:EnableMouse (true)
self.floatingframe:EnableMouse (true)
self.switchButton:EnableMouse (true)
self.backgroundDisplay:EnableMouse (true)
self.baseframe.UPFrame:EnableMouse (true)
end
--titlebar icons
local toolbar_buttons = {}
toolbar_buttons [1] = self.baseframe.cabecalho.modo_selecao
toolbar_buttons [2] = self.baseframe.cabecalho.segmento
toolbar_buttons [3] = self.baseframe.cabecalho.atributo
toolbar_buttons [4] = self.baseframe.cabecalho.report
toolbar_buttons [5] = self.baseframe.cabecalho.reset
toolbar_buttons [6] = self.baseframe.cabecalho.fechar
for i, button in ipairs (toolbar_buttons) do
button:EnableMouse (toolbar_buttons)
end
else
--player bars
for barIndex, barObject in _ipairs (self.barras) do
barObject:EnableMouse (true)
end
--window frames
self.baseframe:EnableMouse (true)
self.bgframe:EnableMouse (true)
self.rowframe:EnableMouse (true)
self.floatingframe:EnableMouse (true)
self.switchButton:EnableMouse (true)
self.backgroundDisplay:EnableMouse (true)
self.baseframe.UPFrame:EnableMouse (true)
--titlebar icons, forcing true because the player isn't in combat and the inCombat setting is enabled
local toolbar_buttons = {}
toolbar_buttons [1] = self.baseframe.cabecalho.modo_selecao
toolbar_buttons [2] = self.baseframe.cabecalho.segmento
toolbar_buttons [3] = self.baseframe.cabecalho.atributo
toolbar_buttons [4] = self.baseframe.cabecalho.report
toolbar_buttons [5] = self.baseframe.cabecalho.reset
toolbar_buttons [6] = self.baseframe.cabecalho.fechar
for i, button in ipairs (toolbar_buttons) do
button:EnableMouse (true)
end
end
else
--player bars
if (barsClickThrough) then
for barIndex, barObject in _ipairs (self.barras) do
barObject:EnableMouse (false)
end
else
for barIndex, barObject in _ipairs (self.barras) do
barObject:EnableMouse (true)
end
end
--window frame
if (windowClickThrough) then
self.baseframe:EnableMouse (false)
self.bgframe:EnableMouse (false)
self.rowframe:EnableMouse (false)
self.floatingframe:EnableMouse (false)
self.switchButton:EnableMouse (false)
self.backgroundDisplay:EnableMouse (false)
self.baseframe.UPFrame:EnableMouse (false)
else
self.baseframe:EnableMouse (true)
self.bgframe:EnableMouse (true)
self.rowframe:EnableMouse (true)
self.floatingframe:EnableMouse (true)
self.switchButton:EnableMouse (true)
self.backgroundDisplay:EnableMouse (true)
self.baseframe.UPFrame:EnableMouse (true)
end
--titlebar icons
local toolbar_buttons = {}
toolbar_buttons [1] = self.baseframe.cabecalho.modo_selecao
toolbar_buttons [2] = self.baseframe.cabecalho.segmento
toolbar_buttons [3] = self.baseframe.cabecalho.atributo
toolbar_buttons [4] = self.baseframe.cabecalho.report
toolbar_buttons [5] = self.baseframe.cabecalho.reset
toolbar_buttons [6] = self.baseframe.cabecalho.fechar
for i, button in ipairs (toolbar_buttons) do
button:EnableMouse (toolbarIcons)
end
end
end
--endd
function _detalhes:DelayedCheckCombatAlpha (instance)
if (UnitAffectingCombat ("player") or InCombatLockdown()) then
instance:SetWindowAlphaForCombat (true, true) --> hida a janela