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

treeview: better handle previous view when focus/unfocus from CommandView

This commit is contained in:
jgmdev 2022-03-19 23:10:26 -04:00
parent 3ffabced62
commit b741c204db
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/plugins/treeview.lua
View File

@ -8,6 +8,7 @@ local style = require "core.style"
local View = require "core.view" local View = require "core.view"
local ContextMenu = require "core.contextmenu" local ContextMenu = require "core.contextmenu"
local RootView = require "core.rootview" local RootView = require "core.rootview"
local CommandView = require "core.commandview"
config.plugins.treeview = common.merge({ config.plugins.treeview = common.merge({
-- Amount of clicks to open a file -- Amount of clicks to open a file
@ -550,6 +551,8 @@ menu:register(
} }
) )
local previous_view = nil
-- Register the TreeView commands and keymap -- Register the TreeView commands and keymap
command.add(nil, { command.add(nil, {
["treeview:toggle"] = function() ["treeview:toggle"] = function()
@ -558,6 +561,14 @@ command.add(nil, {
["treeview:toggle-focus"] = function() ["treeview:toggle-focus"] = function()
if not core.active_view:is(TreeView) then if not core.active_view:is(TreeView) then
if core.active_view:is(CommandView) then
previous_view = core.last_active_view
else
previous_view = core.active_view
end
if not previous_view then
previous_view = core.root_view:get_primary_node().views[1]
end
core.set_active_view(view) core.set_active_view(view)
if not view.selected_item then if not view.selected_item then
for it, _, y in view:each_item() do for it, _, y in view:each_item() do
@ -567,7 +578,7 @@ command.add(nil, {
end end
else else
core.set_active_view(core.last_active_view) core.set_active_view(previous_view)
end end
end end
}) })