Skip to content

[pob2-port] Fix searching for Low Life in Config tab #9914

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

Open
github-actions wants to merge 1 commit into
base: dev
Choose a base branch
from
+29 −3
Open

[pob2-port] Fix searching for Low Life in Config tab #9914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/Classes/ConfigTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
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)
local label = StripEscapes(varData.label or ""):lower()
local err, match = PCall(string.matchOrPattern, label, searchStr)
if not err and match then
return true
end
Expand Down Expand Up @@ -755,7 +756,7 @@ function ConfigTabClass:Draw(viewPort, inputEvents)
self.height = viewPort.height

for _, event in ipairs(inputEvents) do
if event.type == "KeyDown" then
if event.type == "KeyDown" then
if event.key == "z" and IsKeyDown("CTRL") then
self:Undo()
self.build.buildFlag = true
Expand Down Expand Up @@ -817,7 +818,7 @@ function ConfigTabClass:Draw(viewPort, inputEvents)
maxColY = m_max(maxColY, colY[col])
end
end

local newSetList = { }
for index, configSetId in ipairs(self.configSetOrderList) do
local configSet = self.configSets[configSetId]
Expand Down
25 changes: 25 additions & 0 deletions src/Classes/ConfigTab.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff a/src/Classes/ConfigTab.lua b/src/Classes/ConfigTab.lua (rejected hunks)
@@ -28,12 +28,12 @@ local ConfigTabClass = newClass("ConfigTab", "UndoHandler", "ControlHost", "Cont
self.configSetOrderList = { 1 }
self:CreateConfigSet(1)
self:SetActiveConfigSet(1, true)
-
+
self.enemyLevel = 1

self.sectionList = { }
self.varControls = { }
-
+
self.toggleConfigs = false

self.controls.sectionAnchor = new("LabelControl", { "TOPLEFT", self, "TOPLEFT" }, { 0, 20, 0, 0 }, "")
@@ -1010,7 +1011,7 @@ end

function ConfigTabClass:RenameConfigSet(configSetId, newTitle)
local configSet = self.configSets[configSetId]
-
+
if not configSet then
return
end