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

treeview: add horizontal scrolling #1717

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

treeview: add horizontal scrolling #1717

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2e6467
treeview: add horizontal scrolling
takase1121 Feb 4, 2024
892bd6a
treeview: Fix broken click/hover when scrolled
takase1121 Feb 4, 2024
9cb95e7
treeview: show tooltip for entire selection
takase1121 Feb 4, 2024
c773b33
treeview: make sure scroll_width is not smaller than scroll.x
takase1121 Feb 5, 2024
a68a456
treeview: shrink the scrollable width to current scroll position
takase1121 Feb 6, 2024
71a10c4
treeview: reduce scrollable size when scrollbar is released
takase1121 Feb 28, 2024
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
41 changes: 32 additions & 9 deletions data/plugins/treeview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function TreeView:new()
self.scrollable = true
self.visible = true
self.init_size = true
self.scroll_width = 0
self.target_size = config.plugins.treeview.size
self.cache = {}
self.tooltip = { x = 0, y = 0, begin = 0, alpha = 0 }
Expand Down Expand Up @@ -262,11 +263,11 @@ function TreeView:on_mouse_moved(px, py, ...)

local item_changed, tooltip_changed
for item, x,y,w,h in self:each_item() do
if px > x and py > y and px <= x + w and py <= y + h then
if px > x and py > y and px <= self.size.x and py <= y + h then
item_changed = true
self.hovered_item = item

x,y,w,h = self:get_text_bounding_box(item, x,y,w,h)
x = math.max(x, self.position.x)
if px > x and py > y and px <= x + w and py <= y + h then
tooltip_changed = true
self.tooltip.x, self.tooltip.y = px, py
Expand Down Expand Up @@ -344,6 +345,14 @@ function TreeView:get_scrollable_size()
end


function TreeView:get_h_scrollable_size()
local _, _, v_scroll_w = self.v_scrollbar:get_thumb_rect()
return self.scroll_width + (
self.size.x > self.scroll_width + v_scroll_w and 0 or style.padding.x
)
end


function TreeView:draw_tooltip()
local text = common.home_encode(self.hovered_item.abs_filename)
local w, h = style.font:get_width(text), style.font:get_height(text)
Expand Down Expand Up @@ -389,7 +398,7 @@ end

function TreeView:draw_item_text(item, active, hovered, x, y, w, h)
local item_text, item_font, item_color = self:get_item_text(item, active, hovered)
common.draw_text(item_font, item_color, item_text, nil, x, y, 0, h)
return common.draw_text(item_font, item_color, item_text, nil, x, y, 0, h)
end


Expand All @@ -402,7 +411,7 @@ end

function TreeView:draw_item_body(item, active, hovered, x, y, w, h)
x = x + self:draw_item_icon(item, active, hovered, x, y, w, h)
self:draw_item_text(item, active, hovered, x, y, w, h)
return self:draw_item_text(item, active, hovered, x, y, w, h)
end


Expand All @@ -420,9 +429,9 @@ function TreeView:draw_item_background(item, active, hovered, x, y, w, h)
if hovered then
local hover_color = { table.unpack(style.line_highlight) }
hover_color[4] = 160
renderer.draw_rect(x, y, w, h, hover_color)
renderer.draw_rect(self.position.x, y, self.size.x, h, hover_color)
elseif active then
renderer.draw_rect(x, y, w, h, style.line_highlight)
renderer.draw_rect(self.position.x, y, self.size.x, h, style.line_highlight)
end
end

Expand All @@ -433,7 +442,7 @@ function TreeView:draw_item(item, active, hovered, x, y, w, h)
x = x + item.depth * style.padding.x + style.padding.x
x = x + self:draw_item_chevron(item, active, hovered, x, y, w, h)

self:draw_item_body(item, active, hovered, x, y, w, h)
return self:draw_item_body(item, active, hovered, x, y, w, h)
end


Expand All @@ -445,14 +454,28 @@ function TreeView:draw()
local doc = core.active_view.doc
local active_filename = doc and system.absolute_path(doc.filename or "")

local ox = math.abs(self:get_content_offset())
local sw, ox = 0, math.abs(self:get_content_offset())
for item, x,y,w,h in self:each_item() do
if y + h >= _y and y < _y + _h then
self:draw_item(item,
local w = self:draw_item(
item,
item == self.selected_item,
item == self.hovered_item,
x, y, w, h)
x, y, w, h
) + ox
sw = math.max(w, sw)
end
end
local ss = self:get_h_scrollable_size()
if sw > self.scroll_width then
-- We can increase the scrollable size without issues
self.scroll_width = sw
elseif ss > self.scroll.x + self.size.x and not self.h_scrollbar.dragging then
-- We can decrease it only up to the current scroll position
local so = ss - self.scroll_width -- Keep track of the vertical scrollbar offset
self.scroll_width = math.max(sw + so, self.scroll.x + self.size.x) - so
end

self:draw_scrollbar()
if self.hovered_item and self.tooltip.x and self.tooltip.alpha > 0 then
Expand Down
Loading