Revert "Further simplifies logic for active view in close-all command"

This reverts commit bb6b99b167.
This commit is contained in:
Francesco Abbate 2021-08-27 23:20:08 +02:00
parent a8f4c0c4e5
commit 9592ce85f5
1 changed files with 8 additions and 4 deletions

View File

@ -596,6 +596,8 @@ end
function Node:close_all_docviews(keep_active)
local node_active_view = self.active_view
local lost_active_view = false
if self.type == "leaf" then
local i = 1
while i <= #self.views do
@ -603,6 +605,9 @@ function Node:close_all_docviews(keep_active)
if (view:is(DocView) or view:is(LogView)) and not view:is(CommandView) and
(not keep_active or view ~= self.active_view) then
table.remove(self.views, i)
if view == node_active_view then
lost_active_view = true
end
else
i = i + 1
end
@ -614,10 +619,9 @@ function Node:close_all_docviews(keep_active)
-- top call, the primary node will take the active view anyway.
-- Set the empty view and takes the active view.
self:add_view(EmptyView())
elseif #self.views > 0 then
-- In practice we never get there but if it ever happen we need to
-- reset the Node's active view. We do this irrespectively of what the
-- previous active view was.
elseif #self.views > 0 and lost_active_view then
-- In practice we never get there but if a view remain we need
-- to reset the Node's active view.
self:set_active_view(self.views[1])
end
else