Skip to content

Fix skill gem deletion on ESC/focus cancel #10035

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
xoxorwr wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −3
Open

Fix skill gem deletion on ESC/focus cancel #10035

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
22 changes: 19 additions & 3 deletions src/Classes/GemSelectControl.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,14 @@ function GemSelectClass:SortGemList(gemList)
return sortCache.canSupport[a]
end
end)
if self.buf and #self.buf > 0 then
for index, gemId in ipairs(gemList) do
if gems[gemId] and gems[gemId].name:lower() == self.buf:lower() then
self.selIndex = index
break
end
end
end
end

function GemSelectClass:DPSBuilder()
Expand Down Expand Up @@ -686,12 +694,12 @@ function GemSelectClass:OnFocusGained()
self.EditControl:OnFocusGained()
self.dropped = true
self.selIndex = 0
self.controls.scrollBar.offset = 0
self:UpdateSortCache()
self:BuildList("")
for index, gemId in pairs(self.list) do
if self.gems[gemId] and self.gems[gemId].name == self.buf then
self.selIndex = index
self:ScrollSelIntoView()
break
end
end
Expand Down Expand Up @@ -764,8 +772,16 @@ function GemSelectClass:OnKeyDown(key, doubleClick)
self.dropped = false
self:BuildList("")
self.buf = self.initialBuf
self.selIndex = self.initialIndex
self:UpdateGem(false,true, true)
self.selIndex = 0
if self.buf and #self.buf > 0 then
for index, gemId in ipairs(self.list) do
if self.gems[gemId] and self.gems[gemId].name:lower() == self.buf:lower() then
self.selIndex = index
break
end
end
end
self:UpdateGem(true, false, true)
return
elseif self.controls.scrollBar:IsScrollUpKey(key) then
self.controls.scrollBar:Scroll(-1)
Expand Down
Loading