Merge branch 'experimental' of https://github.com/Szyler/AscensionAtlas into experimental

This commit is contained in:
Anch
2022-08-04 12:43:11 +12:00
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -566,7 +566,7 @@ function AtlasLoot:AdvancedSearch(Text)
advSearchString = AppendSearchString(advSearchString, "dif=" .. AtlasLoot_AdvSearchOptions["difficulty"]);
end
if(AtlasLootDefaultFrame_AdvancedSearchPanel_LevelToggle:GetChecked()) then
if(not AtlasLootDefaultFrame_AdvancedSearchPanel_LevelToggle:GetChecked()) then
if (GetTextByName("LevelMin") and GetTextByName("LevelMin") ~= "") then
advSearchString = AppendSearchString(advSearchString, "minlvl>=" .. GetTextByName("LevelMin"));
end
@@ -580,11 +580,11 @@ function AtlasLoot:AdvancedSearch(Text)
end
if (GetTextByName("iLevelMin") and GetTextByName("iLevelMin") ~= "") then
advSearchString = AppendSearchString(advSearchString, "ilvl>=" .. GetTextByName("ILevelMin"));
advSearchString = AppendSearchString(advSearchString, "ilvl>=" .. GetTextByName("iLevelMin"));
end
if (GetTextByName("iLevelMax") and GetTextByName("iLevelMax") ~= "") then
advSearchString = AppendSearchString(advSearchString, "ilvl<=" .. GetTextByName("ILevelMax"));
advSearchString = AppendSearchString(advSearchString, "ilvl<=" .. GetTextByName("iLevelMax"));
end
for i = 1, ACTIVE_ARGUMENT, 1 do
@@ -139,7 +139,7 @@ argpanel.title:SetText("Additional Filters: ");
argpanel.title:SetPoint("TOPLEFT", argpanel, "TOPLEFT", 0, 0);
local addArg = CreateFrame("Button", "AtlasLootDefaultFrame_AdvancedSearchPanel_ArgumentContainerAddArgBtn", AtlasLootDefaultFrame_AdvancedSearchPanel_ArgumentContainer, "OptionsButtonTemplate");
addArg:SetPoint("TOP", useleveltick, "BOTTOM", 0, -20);
addArg:SetPoint("TOP", useleveltick, "BOTTOM", 5, -20);
addArg:SetSize(20, 20);
addArg:SetText("+");
addArg:SetScript("OnClick", function(self, button)