From f729d7d0081933fd00080ed31eb210d9ecdf44f7 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Sat, 5 Jun 2021 20:46:09 -0400 Subject: [PATCH 1/3] Allows you to drag nodes around splits. --- data/core/rootview.lua | 85 +++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/data/core/rootview.lua b/data/core/rootview.lua index b01303c..31268d3 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -129,36 +129,42 @@ function Node:split(dir, view, locked, resizable) return self.b end +function Node:remove_view(root, view, new_active_view) + if #self.views > 1 then + local idx = self:get_view_idx(view) + if idx < self.tab_offset then + self.tab_offset = self.tab_offset - 1 + end + table.remove(self.views, idx) + if new_active_view then + self:set_active_view(self.views[idx] or self.views[#self.views]) + end + else + local parent = self:get_parent_node(root) + local is_a = (parent.a == self) + local other = parent[is_a and "b" or "a"] + if other:get_locked_size() then + self.views = {} + self:add_view(EmptyView()) + else + parent:consume(other) + local p = parent + while p.type ~= "leaf" do + p = p[is_a and "a" or "b"] + end + p:set_active_view(p.active_view) + if self.is_primary_node then + p.is_primary_node = true + end + end + end + core.last_active_view = nil +end function Node:close_view(root, view) local new_active_view = view == self.active_view local do_close = function() - if #self.views > 1 then - local idx = self:get_view_idx(view) - table.remove(self.views, idx) - if new_active_view then - self:set_active_view(self.views[idx] or self.views[#self.views]) - end - else - local parent = self:get_parent_node(root) - local is_a = (parent.a == self) - local other = parent[is_a and "b" or "a"] - if other:get_locked_size() then - self.views = {} - self:add_view(EmptyView()) - else - parent:consume(other) - local p = parent - while p.type ~= "leaf" do - p = p[is_a and "a" or "b"] - end - p:set_active_view(p.active_view) - if self.is_primary_node then - p.is_primary_node = true - end - end - end - core.last_active_view = nil + self:remove_view(root, view, new_active_view) end view:try_close(do_close) end @@ -169,13 +175,13 @@ function Node:close_active_view(root) end -function Node:add_view(view) +function Node:add_view(view, idx) assert(self.type == "leaf", "Tried to add view to non-leaf node") assert(not self.locked, "Tried to add view to locked node") if self.views[1] and self.views[1]:is(EmptyView) then table.remove(self.views) end - table.insert(self.views, view) + table.insert(self.views, idx or (#self.views + 1), view) self:set_active_view(view) end @@ -749,7 +755,7 @@ function RootView:on_mouse_pressed(button, x, y, clicks) if button == "middle" or node.hovered_close == idx then node:close_view(self.root_node, node.views[idx]) else - self.dragged_node = idx + self.dragged_node = { node, idx } node:set_active_view(node.views[idx]) end else @@ -816,15 +822,24 @@ function RootView:on_mouse_moved(x, y, dx, dy) end elseif tab_index then core.request_cursor("arrow") - if self.dragged_node and self.dragged_node ~= tab_index then - local tab = node.views[self.dragged_node] - table.remove(node.views, self.dragged_node) - table.insert(node.views, tab_index, tab) - self.dragged_node = tab_index - end else core.request_cursor(node.active_view.cursor) end + if self.dragged_node and (self.dragged_node[1] ~= node or (tab_index and self.dragged_node[2] ~= tab_index)) + 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]] + if self.dragged_node[1] ~= node then + self.dragged_node[1]:remove_view(self.root_node, tab) + node:add_view(tab, tab_index) + tab_index = tab_index or #node.views + self.root_node:update_layout() + core.redraw = true + else + table.remove(self.dragged_node[1].views, self.dragged_node[2]) + table.insert(node.views, tab_index, tab) + end + self.dragged_node = { node, tab_index } + end end From a18eeafbc815b2bf3b080eb3776a26de36d2911f Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Sat, 5 Jun 2021 21:55:12 -0400 Subject: [PATCH 2/3] Added in some more checks. --- data/core/rootview.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/core/rootview.lua b/data/core/rootview.lua index 31268d3..ba64445 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -822,10 +822,10 @@ function RootView:on_mouse_moved(x, y, dx, dy) end elseif tab_index then core.request_cursor("arrow") - else + elseif node then core.request_cursor(node.active_view.cursor) end - if self.dragged_node and (self.dragged_node[1] ~= node or (tab_index and self.dragged_node[2] ~= tab_index)) + if node and self.dragged_node and (self.dragged_node[1] ~= node or (tab_index and self.dragged_node[2] ~= tab_index)) 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]] if self.dragged_node[1] ~= node then From 66b76f15c290b60a868817905d310443913601cf Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Sat, 12 Jun 2021 14:24:31 -0400 Subject: [PATCH 3/3] Added a check for duplicate tabs, also ensured that the appropriate view is set as active. --- data/core/rootview.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/data/core/rootview.lua b/data/core/rootview.lua index ba64445..1fd5135 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -129,14 +129,14 @@ function Node:split(dir, view, locked, resizable) return self.b end -function Node:remove_view(root, view, new_active_view) +function Node:remove_view(root, view) if #self.views > 1 then local idx = self:get_view_idx(view) if idx < self.tab_offset then self.tab_offset = self.tab_offset - 1 end 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]) end else @@ -162,9 +162,8 @@ function Node:remove_view(root, view, new_active_view) end function Node:close_view(root, view) - local new_active_view = view == self.active_view local do_close = function() - self:remove_view(root, view, new_active_view) + self:remove_view(root, view) end view:try_close(do_close) 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 local tab = self.dragged_node[1].views[self.dragged_node[2]] if self.dragged_node[1] ~= node then - self.dragged_node[1]:remove_view(self.root_node, tab) - node:add_view(tab, tab_index) - tab_index = tab_index or #node.views - self.root_node:update_layout() - core.redraw = true + for i, v in ipairs(node.views) do if v.doc == tab.doc then tab = nil break end end + if tab then + self.dragged_node[1]:remove_view(self.root_node, tab) + node:add_view(tab, tab_index) + self.root_node:update_layout() + self.dragged_node = { node, tab_index or #node.views } + core.redraw = true + end else table.remove(self.dragged_node[1].views, self.dragged_node[2]) table.insert(node.views, tab_index, tab) + self.dragged_node = { node, tab_index } end - self.dragged_node = { node, tab_index } end end