Skip to content

Commit c71530f

Browse files
Strawberry-devsStrawberry-devs
committed
Extplates: remove showall button & functionality
1 parent f49bcb7 commit c71530f

2 files changed

Lines changed: 20 additions & 29 deletions

File tree

‎extendedplates/shared.lua‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ local function ensureUiState()
180180
}
181181

182182
if type(saved) == "table" then
183-
shared.uiState.filterTrackedOnly = saved.filterTrackedOnly ~= false
184183
if saved.activeScope == "target" or saved.activeScope == "self" then
185184
shared.uiState.activeScope = saved.activeScope
186185
end
@@ -274,12 +273,18 @@ local function ensureUiState()
274273
end
275274
shared.uiState.target.hidden = false
276275
end
276+
shared.uiState.filterTrackedOnly = true
277+
if type(saved) == "table" and saved.filterTrackedOnly == false and ADDON ~= nil then
278+
ADDON:ClearData(shared.dataKeys.ui)
279+
ADDON:SaveData(shared.dataKeys.ui, shared.uiState)
280+
end
277281

278282
return shared.uiState
279283
end
280284

281285
function shared.SaveUiState()
282286
local uiState = ensureUiState()
287+
uiState.filterTrackedOnly = true
283288
if ADDON ~= nil then
284289
ADDON:ClearData(shared.dataKeys.ui)
285290
ADDON:SaveData(shared.dataKeys.ui, uiState)
@@ -698,10 +703,6 @@ function shared.ShouldDisplay(scope, effectType, effectId)
698703
return false
699704
end
700705

701-
if uiState.filterTrackedOnly ~= true then
702-
return true
703-
end
704-
705706
return shared.IsTracked(scope, effectType, effectId)
706707
end
707708

‎extendedplates/tracktarget.lua‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,19 +2010,10 @@ createCategoryRow(3, "self", "buff")
20102010
createCategoryRow(4, "self", "debuff")
20112011
createCategoryRow(5, "self", "hidden")
20122012

2013-
local filterButton = managerWindow:CreateChildWidget("button", "filterButton", 0, true)
2014-
ApplyLocalButtonStyle(filterButton)
2015-
filterButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2016-
filterButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(7))
2017-
filterButton:SetHandler("OnClick", function()
2018-
uiState.filterTrackedOnly = not uiState.filterTrackedOnly
2019-
shared.SaveUiState()
2020-
end)
2021-
20222013
showGearButton = managerWindow:CreateChildWidget("button", "showGearButton", 0, true)
20232014
ApplyLocalButtonStyle(showGearButton)
20242015
showGearButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2025-
showGearButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(8))
2016+
showGearButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(7))
20262017
showGearButton:SetHandler("OnClick", function()
20272018
uiState.showGear = not uiState.showGear
20282019
shared.SaveUiState()
@@ -2031,7 +2022,7 @@ end)
20312022
showGearSettingsButton = managerWindow:CreateChildWidget("button", "showGearSettingsButton", 0, true)
20322023
ApplyLocalButtonStyle(showGearSettingsButton)
20332024
SetSecondaryButtonExtent(showGearSettingsButton)
2034-
showGearSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(8))
2025+
showGearSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(7))
20352026
showGearSettingsButton:SetText("...")
20362027
showGearSettingsButton:SetHandler("OnClick", function()
20372028
infoSettingsMode = "gear"
@@ -2043,7 +2034,7 @@ end)
20432034
showClassButton = managerWindow:CreateChildWidget("button", "showClassButton", 0, true)
20442035
ApplyLocalButtonStyle(showClassButton)
20452036
showClassButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2046-
showClassButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(9))
2037+
showClassButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(8))
20472038
showClassButton:SetHandler("OnClick", function()
20482039
uiState.showClass = not uiState.showClass
20492040
shared.SaveUiState()
@@ -2052,7 +2043,7 @@ end)
20522043
showClassSettingsButton = managerWindow:CreateChildWidget("button", "showClassSettingsButton", 0, true)
20532044
ApplyLocalButtonStyle(showClassSettingsButton)
20542045
SetSecondaryButtonExtent(showClassSettingsButton)
2055-
showClassSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(9))
2046+
showClassSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(8))
20562047
showClassSettingsButton:SetText("...")
20572048
showClassSettingsButton:SetHandler("OnClick", function()
20582049
infoSettingsMode = "class"
@@ -2064,7 +2055,7 @@ end)
20642055
showDistanceButton = managerWindow:CreateChildWidget("button", "showDistanceButton", 0, true)
20652056
ApplyLocalButtonStyle(showDistanceButton)
20662057
showDistanceButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2067-
showDistanceButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(10))
2058+
showDistanceButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(9))
20682059
showDistanceButton:SetHandler("OnClick", function()
20692060
uiState.showDistance = not uiState.showDistance
20702061
shared.SaveUiState()
@@ -2073,7 +2064,7 @@ end)
20732064
showDistanceSettingsButton = managerWindow:CreateChildWidget("button", "showDistanceSettingsButton", 0, true)
20742065
ApplyLocalButtonStyle(showDistanceSettingsButton)
20752066
SetSecondaryButtonExtent(showDistanceSettingsButton)
2076-
showDistanceSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(10))
2067+
showDistanceSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(9))
20772068
showDistanceSettingsButton:SetText("...")
20782069
showDistanceSettingsButton:SetHandler("OnClick", function()
20792070
infoSettingsMode = "distance"
@@ -2085,7 +2076,7 @@ end)
20852076
showCastbarButton = managerWindow:CreateChildWidget("button", "showCastbarButton", 0, true)
20862077
ApplyLocalButtonStyle(showCastbarButton)
20872078
showCastbarButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2088-
showCastbarButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(11))
2079+
showCastbarButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(10))
20892080
showCastbarButton:SetHandler("OnClick", function()
20902081
uiState.showCastbar = not uiState.showCastbar
20912082
shared.SaveUiState()
@@ -2094,7 +2085,7 @@ end)
20942085
showCastbarSettingsButton = managerWindow:CreateChildWidget("button", "showCastbarSettingsButton", 0, true)
20952086
ApplyLocalButtonStyle(showCastbarSettingsButton)
20962087
SetSecondaryButtonExtent(showCastbarSettingsButton)
2097-
showCastbarSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(11))
2088+
showCastbarSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(10))
20982089
showCastbarSettingsButton:SetText("...")
20992090
showCastbarSettingsButton:SetHandler("OnClick", function()
21002091
infoSettingsMode = "castbar"
@@ -2109,7 +2100,7 @@ end)
21092100
showEquipmentButton = managerWindow:CreateChildWidget("button", "showEquipmentButton", 0, true)
21102101
ApplyLocalButtonStyle(showEquipmentButton)
21112102
showEquipmentButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2112-
showEquipmentButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(12))
2103+
showEquipmentButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(11))
21132104
showEquipmentButton:SetHandler("OnClick", function()
21142105
uiState.showEquipment = not uiState.showEquipment
21152106
shared.SaveUiState()
@@ -2118,7 +2109,7 @@ end)
21182109
showEquipmentSettingsButton = managerWindow:CreateChildWidget("button", "showEquipmentSettingsButton", 0, true)
21192110
ApplyLocalButtonStyle(showEquipmentSettingsButton)
21202111
SetSecondaryButtonExtent(showEquipmentSettingsButton)
2121-
showEquipmentSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(12))
2112+
showEquipmentSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(11))
21222113
showEquipmentSettingsButton:SetText("...")
21232114
showEquipmentSettingsButton:SetHandler("OnClick", function()
21242115
infoSettingsMode = "equipment"
@@ -2130,7 +2121,7 @@ end)
21302121
drawLinesButton = managerWindow:CreateChildWidget("button", "drawLinesButton", 0, true)
21312122
ApplyLocalButtonStyle(drawLinesButton)
21322123
drawLinesButton:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2133-
drawLinesButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(13))
2124+
drawLinesButton:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(12))
21342125
drawLinesButton:SetHandler("OnClick", function()
21352126
drawLinesEnabled = not drawLinesEnabled
21362127
SaveDrawLinesSettings()
@@ -2139,7 +2130,7 @@ end)
21392130
drawLinesSettingsButton = managerWindow:CreateChildWidget("button", "drawLinesSettingsButton", 0, true)
21402131
ApplyLocalButtonStyle(drawLinesSettingsButton)
21412132
SetSecondaryButtonExtent(drawLinesSettingsButton)
2142-
drawLinesSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(13))
2133+
drawLinesSettingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(12))
21432134
drawLinesSettingsButton:SetText("...")
21442135
drawLinesSettingsButton:SetHandler("OnClick", function()
21452136
if drawLinesSettingsWindow ~= nil then
@@ -2150,7 +2141,7 @@ end)
21502141
cdt.button = managerWindow:CreateChildWidget("button", "cooldownTrackerButton", 0, true)
21512142
ApplyLocalButtonStyle(cdt.button)
21522143
cdt.button:SetExtent(SIMPLE_BUTTON_WIDTH, SIMPLE_BUTTON_HEIGHT)
2153-
cdt.button:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(14))
2144+
cdt.button:AddAnchor("TOPLEFT", managerWindow, LEFT_BUTTON_X, LowerLeftButtonY(13))
21542145
cdt.button:SetHandler("OnClick", function()
21552146
cdt.enabled = not cdt.enabled
21562147
cdt.SaveSettings()
@@ -2159,7 +2150,7 @@ end)
21592150
cdt.settingsButton = managerWindow:CreateChildWidget("button", "cooldownTrackerSettingsButton", 0, true)
21602151
ApplyLocalButtonStyle(cdt.settingsButton)
21612152
SetSecondaryButtonExtent(cdt.settingsButton)
2162-
cdt.settingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(14))
2153+
cdt.settingsButton:AddAnchor("TOPLEFT", managerWindow, SECONDARY_BUTTON_X, LowerLeftButtonY(13))
21632154
cdt.settingsButton:SetText("...")
21642155
cdt.settingsButton:SetHandler("OnClick", function()
21652156
cdt.ShowSettingsWindow()
@@ -4318,7 +4309,6 @@ function refreshWindow()
43184309
headerLabel:SetText(categoryTitle(scope, effectType))
43194310
trackedTitle:SetText("Tracked " .. categoryTitle(scope, effectType))
43204311
availableTitle:SetText(liveSectionTitle(scope, effectType))
4321-
filterButton:SetText("Show All [" .. (uiState.filterTrackedOnly and "OFF" or "ON") .. "]")
43224312
showGearButton:SetText("Show Gear [" .. (uiState.showGear and "ON" or "OFF") .. "]")
43234313
showEquipmentButton:SetText("Show Equipment [" .. (uiState.showEquipment and "ON" or "OFF") .. "]")
43244314
showClassButton:SetText("Show Class [" .. (uiState.showClass and "ON" or "OFF") .. "]")

0 commit comments

Comments
 (0)