From ca9bf21819a382fc39b834173d10c795c218b427 Mon Sep 17 00:00:00 2001 From: Francesco Abbate Date: Sun, 6 Dec 2020 13:24:55 +0100 Subject: [PATCH] Reword name for identifying primary view --- data/core/init.lua | 2 +- data/core/rootview.lua | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/core/init.lua b/data/core/init.lua index 00c3b54..461f839 100644 --- a/data/core/init.lua +++ b/data/core/init.lua @@ -180,7 +180,7 @@ function core.init() core.command_view = CommandView() core.status_view = StatusView() - core.root_view.root_node.has_documents_view = true + core.root_view.root_node.is_primary_view = true core.root_view.root_node:split("down", core.command_view, true) core.root_view.root_node.b:split("down", core.status_view, true) diff --git a/data/core/rootview.lua b/data/core/rootview.lua index a6e8ae3..690fdee 100644 --- a/data/core/rootview.lua +++ b/data/core/rootview.lua @@ -397,7 +397,7 @@ function Node:close_all_docviews() i = i + 1 end end - if #self.views == 0 and self.has_documents_view then + if #self.views == 0 and self.is_primary_view then self:add_view(EmptyView()) end else @@ -432,17 +432,17 @@ function RootView:get_active_node() return self.root_node:get_node_for_view(core.active_view) end -local function get_main_document_view(node) - if node.has_documents_view then +local function get_primary_view(node) + if node.is_primary_view then return node end if node.type ~= "leaf" then - return get_main_document_view(node.a) or get_main_document_view(node.b) + return get_primary_view(node.a) or get_primary_view(node.b) end end -function RootView:get_main_document_view() - local node = get_main_document_view(self.root_node) +function RootView:get_primary_view() + local node = get_primary_view(self.root_node) if node then return node.views[1] end @@ -451,7 +451,7 @@ end function RootView:open_doc(doc) local node = self:get_active_node() if node.locked then - local default_view = self:get_main_document_view() + local default_view = self:get_primary_view() assert(default_view, "internal error: cannot find original document node.") core.set_active_view(default_view) node = self:get_active_node()