walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Keep active view when closing inactive tabs

This commit is contained in:
Francesco Abbate 2021-02-27 23:55:36 +01:00
parent 4d320c1946
commit f708a53a04
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
data/core/rootview.lua
View File

@ -124,12 +124,15 @@ function Node:split(dir, view, locked, resizable)
end end
function Node:close_active_view(root) function Node:close_view(root, view)
local new_active_view = view == self.active_view
local do_close = function() local do_close = function()
if #self.views > 1 then if #self.views > 1 then
local idx = self:get_view_idx(self.active_view) local idx = self:get_view_idx(view)
table.remove(self.views, idx) table.remove(self.views, idx)
if new_active_view then
self:set_active_view(self.views[idx] or self.views[#self.views]) self:set_active_view(self.views[idx] or self.views[#self.views])
end
else else
local parent = self:get_parent_node(root) local parent = self:get_parent_node(root)
local is_a = (parent.a == self) local is_a = (parent.a == self)
@ -151,7 +154,12 @@ function Node:close_active_view(root)
end end
core.last_active_view = nil core.last_active_view = nil
end end
self.active_view:try_close(do_close) view:try_close(do_close)
end
function Node:close_active_view(root)
self:close_view(root, self.active_view)
end end
@ -581,9 +589,10 @@ function RootView:on_mouse_pressed(button, x, y, clicks)
local node = self.root_node:get_child_overlapping_point(x, y) local node = self.root_node:get_child_overlapping_point(x, y)
local idx = node:get_tab_overlapping_point(x, y) local idx = node:get_tab_overlapping_point(x, y)
if idx then if idx then
node:set_active_view(node.views[idx])
if button == "middle" or node.hovered_close == idx then if button == "middle" or node.hovered_close == idx then
node:close_active_view(self.root_node) node:close_view(self.root_node, node.views[idx])
else
node:set_active_view(node.views[idx])
end end
else else
core.set_active_view(node.active_view) core.set_active_view(node.active_view)