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

Added a check for duplicate tabs, also ensured that the appropriate view is set as active.

This commit is contained in:
Adam Harrison 2021-06-12 14:24:31 -04:00
parent a18eeafbc8
commit 66b76f15c2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/core/rootview.lua
View File

@ -129,14 +129,14 @@ function Node:split(dir, view, locked, resizable)
return self.b return self.b
end end
function Node:remove_view(root, view, new_active_view) function Node:remove_view(root, view)
if #self.views > 1 then if #self.views > 1 then
local idx = self:get_view_idx(view) local idx = self:get_view_idx(view)
if idx < self.tab_offset then if idx < self.tab_offset then
self.tab_offset = self.tab_offset - 1 self.tab_offset = self.tab_offset - 1
end end
table.remove(self.views, idx) table.remove(self.views, idx)
if new_active_view then if self.active_view == 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 end
else else
@ -162,9 +162,8 @@ function Node:remove_view(root, view, new_active_view)
end end
function Node:close_view(root, view) function Node:close_view(root, view)
local new_active_view = view == self.active_view
local do_close = function() local do_close = function()
self:remove_view(root, view, new_active_view) self:remove_view(root, view)
end end
view:try_close(do_close) view:try_close(do_close)
end end
@ -829,16 +828,19 @@ function RootView:on_mouse_moved(x, y, dx, dy)
and node.type == "leaf" and #node.views > 0 and node.views[1]:is(DocView) then and node.type == "leaf" and #node.views > 0 and node.views[1]:is(DocView) then
local tab = self.dragged_node[1].views[self.dragged_node[2]] local tab = self.dragged_node[1].views[self.dragged_node[2]]
if self.dragged_node[1] ~= node then if self.dragged_node[1] ~= node then
self.dragged_node[1]:remove_view(self.root_node, tab) for i, v in ipairs(node.views) do if v.doc == tab.doc then tab = nil break end end
node:add_view(tab, tab_index) if tab then
tab_index = tab_index or #node.views self.dragged_node[1]:remove_view(self.root_node, tab)
self.root_node:update_layout() node:add_view(tab, tab_index)
core.redraw = true self.root_node:update_layout()
self.dragged_node = { node, tab_index or #node.views }
core.redraw = true
end
else else
table.remove(self.dragged_node[1].views, self.dragged_node[2]) table.remove(self.dragged_node[1].views, self.dragged_node[2])
table.insert(node.views, tab_index, tab) table.insert(node.views, tab_index, tab)
self.dragged_node = { node, tab_index }
end end
self.dragged_node = { node, tab_index }
end end
end end