From f482ea318a4d3acfc164c20d936d68050770453d Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Thu, 11 Feb 2021 16:12:21 +0100 Subject: [PATCH] Makes resizable attribute explicit in Node:split() --- data/core/init.lua | 7 ++++--- data/core/rootview.lua | 3 ++- data/plugins/treeview.lua | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/core/init.lua b/data/core/init.lua index 17eb2561..2f41d784 100644 --- a/data/core/init.lua +++ b/data/core/init.lua @@ -399,9 +399,10 @@ function core.init() core.command_view = CommandView() core.status_view = StatusView() - core.root_view.root_node.is_primary_node = true - core.root_view.root_node:split("down", core.command_view, true) - core.root_view.root_node.b:split("down", core.status_view, true) + local cur_node = core.root_view.root_node + cur_node.is_primary_node = true + cur_node = cur_node:split("down", core.command_view, true) + cur_node = cur_node:split("down", core.status_view, true) core.project_scan_thread_id = core.add_thread(project_scan_thread) command.add_defaults() diff --git a/data/core/rootview.lua b/data/core/rootview.lua index 0ae9ab2e..456d9b62 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -92,7 +92,7 @@ end local type_map = { up="vsplit", down="vsplit", left="hsplit", right="hsplit" } -function Node:split(dir, view, locked) +function Node:split(dir, view, locked, resizable) assert(self.type == "leaf", "Tried to split non-leaf node") local type = assert(type_map[dir], "Invalid direction") local last_active = core.active_view @@ -104,6 +104,7 @@ function Node:split(dir, view, locked) if view then self.b:add_view(view) end if locked then self.b.locked = locked + self.b.resizable = resizable or false core.set_active_view(last_active) end if dir == "up" or dir == "left" then diff --git a/data/plugins/treeview.lua b/data/plugins/treeview.lua index 61f0cb89..77c1ce0e 100644 --- a/data/plugins/treeview.lua +++ b/data/plugins/treeview.lua @@ -249,8 +249,7 @@ end -- init local view = TreeView() local node = core.root_view:get_active_node() -local treeview_node = node:split("left", view, true) -treeview_node.resizable = true +local treeview_node = node:split("left", view, true, true) -- register commands and keymap