Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for search input to Configuration tab #6178

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Add support for search input to Configuration tab #6178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3e9d1
Add support for search input to Configuration tab
deathbeam Apr 30, 2023
d664e77
Add search hotkey + clear button
Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/Classes/ConfigTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,23 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont

self:BuildModList()

self.controls.search = new("EditControl", { "TOPLEFT", self, "TOPLEFT" }, 8, 5, 360, 20, "", "Search", "%c", 100, function()
self:UpdateControls()
end, nil, nil, true)
self.controls.sectionAnchor = new("LabelControl", { "TOPLEFT", self.controls.search, "TOPLEFT" }, -10, 15, 0, 0, "")

local function searchMatch(varData)
local searchStr = self.controls.search.buf:lower():gsub("[%-%.%+%[%]%$%^%%%?%*]", "%%%0")
if searchStr and searchStr:match("%S") then
local err, match = PCall(string.matchOrPattern, (varData.label or ""):lower(), searchStr)
if not err and match then
return true
end
return false
end
return true
end

local function implyCond(varData)
local mainEnv = self.build.calcsTab.mainEnv
if self.input[varData.var] then
Expand Down Expand Up @@ -81,7 +98,7 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
local lastSection
for _, varData in ipairs(varList) do
if varData.section then
lastSection = new("SectionControl", {"TOPLEFT",self,"TOPLEFT"}, 0, 0, 360, 0, varData.section)
lastSection = new("SectionControl", {"TOPLEFT",self.controls.sectionAnchor,"TOPLEFT"}, 0, 0, 360, 0, varData.section)
lastSection.varControlList = { }
lastSection.col = varData.col
lastSection.height = function(self)
Expand Down Expand Up @@ -143,6 +160,10 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont

local shownFuncs = {}
control.shown = function()
if not searchMatch(varData) then
return false
end

for _, shownFunc in ipairs(shownFuncs) do
if not shownFunc() then
return false
Expand Down Expand Up @@ -471,6 +492,9 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont

if not varData.hideIfInvalid then
control.shown = function()
if not searchMatch(varData) then
return false
end
local shown = type(innerShown) == "boolean" and innerShown or innerShown()
local cur = self.input[varData.var]
local def = self:GetDefaultState(varData.var, type(cur))
Expand Down Expand Up @@ -631,6 +655,8 @@ function ConfigTabClass:Draw(viewPort, inputEvents)
elseif event.key == "y" and IsKeyDown("CTRL") then
self:Redo()
self.build.buildFlag = true
elseif event.key == "f" and IsKeyDown("CTRL") then
self:SelectControl(self.controls.search)
end
end
end
Expand Down