Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-05-03 19:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix UITabBar and UIMoveableTabBar bricking when removing first tabs in (#1101) collapsed view

Browse Source 
Co-authored-by: Xagul <eixim@hotmail.com>
This commit is contained in:
diath 2020-08-26 09:54:56 +02:00 committed by GitHub
parent b3aaa10646
commit 88d0ea34bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/corelib/ui/uimovabletabbar.lua
View File

@ -334,9 +334,12 @@ function UIMoveableTabBar:removeTab(tab)
end end
if self.currentTab == tab then if self.currentTab == tab then
self:selectPrevTab()
if #self.tabs == 1 then if #self.tabs == 1 then
self.currentTab = nil self.currentTab = nil
elseif index == #self.tabs then
self:selectPrevTab()
else
self:selectNextTab()
end end
end end
table.remove(tabTable, index) table.remove(tabTable, index)

8
modules/corelib/ui/uitabbar.lua
View File

@ -77,7 +77,13 @@ function UITabBar:removeTab(tab)
local index = table.find(self.tabs, tab) local index = table.find(self.tabs, tab)
if index == nil then return end if index == nil then return end
if self.currentTab == tab then if self.currentTab == tab then
self:selectPrevTab() if #self.tabs == 1 then
self.currentTab = nil
elseif index == #self.tabs then
self:selectPrevTab()
else
self:selectNextTab()
end
end end
table.remove(self.tabs, index) table.remove(self.tabs, index)
tab:destroy() tab:destroy()