Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plugin treeview: respect user setting of disabling context menu #1551

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

plugin treeview: respect user setting of disabling context menu #1551

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b624f3
plugin treeview: respect user setting of disabling context menu
SwissalpS Jun 29, 2023
b3019e5
defer loading
SwissalpS Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
defer loading
  • Loading branch information
@SwissalpS
SwissalpS committed Jun 30, 2023
commit b3019e50cc9f5979517ee9811f043514d92015ec
243 changes: 127 additions & 116 deletions data/plugins/treeview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ local View = require "core.view"
local RootView = require "core.rootview"
local CommandView = require "core.commandview"
local DocView = require "core.docview"
local ContextMenu
if false ~= config.plugins.contextmenu then
ContextMenu = require "core.contextmenu"
end
local ContextMenu, menu = nil, nil

config.plugins.treeview = common.merge({
-- Default treeview width
Expand Down Expand Up @@ -557,41 +554,6 @@ if config.plugins.toolbarview ~= false and toolbar_plugin then
})
end

-- Add a context menu to the treeview
local menu
if ContextMenu then
menu = ContextMenu()

local on_view_mouse_pressed = RootView.on_view_mouse_pressed
local on_mouse_moved = RootView.on_mouse_moved
local root_view_update = RootView.update
local root_view_draw = RootView.draw

function RootView:on_mouse_moved(...)
if menu:on_mouse_moved(...) then return end
on_mouse_moved(self, ...)
end

function RootView.on_view_mouse_pressed(button, x, y, clicks)
-- We give the priority to the menu to process mouse pressed events.
if button == "right" then
view.tooltip.alpha = 0
view.tooltip.x, view.tooltip.y = nil, nil
end
local handled = menu:on_mouse_pressed(button, x, y, clicks)
return handled or on_view_mouse_pressed(button, x, y, clicks)
end

function RootView:update(...)
root_view_update(self, ...)
menu:update()
end

function RootView:draw(...)
root_view_draw(self, ...)
menu:draw()
end
end

local on_quit_project = core.on_quit_project
function core.on_quit_project()
Expand All @@ -616,47 +578,6 @@ end
local function treeitem() return view.hovered_item or view.selected_item end


if ContextMenu then
menu:register(function() return core.active_view:is(TreeView) and treeitem() end, {
{ text = "Open in System", command = "treeview:open-in-system" },
ContextMenu.DIVIDER
})

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item and not is_project_folder(item.abs_filename)
end,
{
{ text = "Rename", command = "treeview:rename" },
{ text = "Delete", command = "treeview:delete" },
}
)

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item and item.type == "dir"
end,
{
{ text = "New File", command = "treeview:new-file" },
{ text = "New Folder", command = "treeview:new-folder" },
}
)

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item
and not is_primary_project_folder(item.abs_filename)
and is_project_folder(item.abs_filename)
end,
{
{ text = "Remove directory", command = "treeview:remove-project-directory" },
}
)
end

local previous_view = nil

-- Register the TreeView commands and keymap
Expand Down Expand Up @@ -922,17 +843,9 @@ command.add(

local projectsearch = pcall(require, "plugins.projectsearch")
if projectsearch then
if menu then
menu:register(function()
local item = treeitem()
return item and item.type == "dir"
end, {
{ text = "Find in directory", command = "treeview:search-in-directory" }
})
end
command.add(function()
return view.hovered_item and view.hovered_item.type == "dir"
end, {
return view.hovered_item and view.hovered_item.type == "dir"
end, {
["treeview:search-in-directory"] = function(item)
command.perform("project-search:find", view.hovered_item.abs_filename)
end
Expand All @@ -951,25 +864,6 @@ command.add(function()
})


command.add(
function()
return menu and menu.show_context_menu == true and core.active_view:is(TreeView)
end, {
["treeview-context:focus-previous"] = function()
menu:focus_previous()
end,
["treeview-context:focus-next"] = function()
menu:focus_next()
end,
["treeview-context:hide"] = function()
menu:hide()
end,
["treeview-context:on-selected"] = function()
menu:call_selected_item()
end,
})


keymap.add {
["ctrl+\\"] = "treeview:toggle",
["up"] = "treeview:previous",
Expand All @@ -985,13 +879,130 @@ keymap.add {
["ctrl+lclick"] = "treeview:new-folder"
}

keymap.add {
["menu"] = "treeview-context:show",
["return"] = "treeview-context:on-selected",
["up"] = "treeview-context:focus-previous",
["down"] = "treeview-context:focus-next",
["escape"] = "treeview-context:hide"
}

-- Add a context menu to the treeview,
-- if user or other plugin hasn't disabled it,
-- and add keymaps used by context menu.
-- Also override some RootView methods.
local function add_context_menu()
if false == config.plugins.contextmenu then return end

ContextMenu = require "core.contextmenu"
menu = ContextMenu()

local on_view_mouse_pressed = RootView.on_view_mouse_pressed
local on_mouse_moved = RootView.on_mouse_moved
local root_view_update = RootView.update
local root_view_draw = RootView.draw

function RootView:on_mouse_moved(...)
if menu:on_mouse_moved(...) then return end
on_mouse_moved(self, ...)
end

function RootView.on_view_mouse_pressed(button, x, y, clicks)
-- We give the priority to the menu to process mouse pressed events.
if button == "right" then
view.tooltip.alpha = 0
view.tooltip.x, view.tooltip.y = nil, nil
end
local handled = menu:on_mouse_pressed(button, x, y, clicks)
return handled or on_view_mouse_pressed(button, x, y, clicks)
end

function RootView:update(...)
root_view_update(self, ...)
menu:update()
end

function RootView:draw(...)
root_view_draw(self, ...)
menu:draw()
end

menu:register(
function()
return core.active_view:is(TreeView) and treeitem()
end, {
{ text = "Open in System", command = "treeview:open-in-system" },
ContextMenu.DIVIDER
})

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item and not is_project_folder(item.abs_filename)
end,
{
{ text = "Rename", command = "treeview:rename" },
{ text = "Delete", command = "treeview:delete" },
}
)

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item and item.type == "dir"
end,
{
{ text = "New File", command = "treeview:new-file" },
{ text = "New Folder", command = "treeview:new-folder" },
}
)

menu:register(
function()
local item = treeitem()
return core.active_view:is(TreeView) and item
and not is_primary_project_folder(item.abs_filename)
and is_project_folder(item.abs_filename)
end,
{
{ text = "Remove directory", command = "treeview:remove-project-directory" },
}
)

command.add(
function()
return menu.show_context_menu == true and core.active_view:is(TreeView)
end, {
["treeview-context:focus-previous"] = function()
menu:focus_previous()
end,
["treeview-context:focus-next"] = function()
menu:focus_next()
end,
["treeview-context:hide"] = function()
menu:hide()
end,
["treeview-context:on-selected"] = function()
menu:call_selected_item()
end,
})

keymap.add {
["menu"] = "treeview-context:show",
["return"] = "treeview-context:on-selected",
["up"] = "treeview-context:focus-previous",
["down"] = "treeview-context:focus-next",
["escape"] = "treeview-context:hide"
}

view.contextmenu = menu

if not projectsearch then return end

menu:register(
function()
local item = treeitem()
return item and item.type == "dir"
end, {
{ text = "Find in directory", command = "treeview:search-in-directory" }
})

end
-- Load context menu after everything has been loaded
core.add_thread(add_context_menu)


-- The config specification used by gui generators
Expand Down