walkero
/
lite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed error on setting active view when closing certain splits in RootView

This commit is contained in:
rxi 2020-04-12 11:14:49 +01:00
parent d4284edd5c
commit 1be7a32c6b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/core/rootview.lua
View File

@ -104,13 +104,18 @@ function Node:close_active_view(root)
self:set_active_view(self.views[idx] or self.views[#self.views]) self:set_active_view(self.views[idx] or self.views[#self.views])
else else
local parent = self:get_parent_node(root) local parent = self:get_parent_node(root)
local other = parent[parent.a == self and "b" or "a"] local is_a = (parent.a == self)
local other = parent[is_a and "b" or "a"]
if other:get_locked_size() then if other:get_locked_size() then
self.views = {} self.views = {}
self:add_view(EmptyView()) self:add_view(EmptyView())
else else
parent:consume(other) parent:consume(other)
parent:set_active_view(parent.active_view) local p = parent
while p.type ~= "leaf" do
p = p[is_a and "a" or "b"]
end
p:set_active_view(p.active_view)
end end
end end
end end
@ -129,6 +134,7 @@ end
function Node:set_active_view(view) function Node:set_active_view(view)
assert(self.type == "leaf", "tried to set active view on non-leaf node")
self.active_view = view self.active_view = view
core.active_view = view core.active_view = view
end end