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

Add tab animation and improve hovering update 

Always update the tab hovering status using the Node:update
method. Previous behavior was to update only on mouse moved
events.
This commit is contained in:
Francesco Abbate 2021-05-15 16:57:20 +02:00
parent b223dbca6f
commit 90e41daa99
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/core/rootview.lua
View File

@ -57,7 +57,10 @@ function Node:new(type)
if self.type == "leaf" then if self.type == "leaf" then
self:add_view(EmptyView()) self:add_view(EmptyView())
end end
self.hovered = {x = -1, y = -1 }
self.hovered_close = 0 self.hovered_close = 0
self.tab_margin = style.padding.x
self.move_towards = View.move_towards
end end
@ -68,9 +71,8 @@ end
function Node:on_mouse_moved(x, y, ...) function Node:on_mouse_moved(x, y, ...)
self.hovered_tab = self:get_tab_overlapping_point(x, y)
if self.type == "leaf" then if self.type == "leaf" then
self:tab_mouse_moved(x, y) self.hovered.x, self.hovered.y = x, y
self.active_view:on_mouse_moved(x, y, ...) self.active_view:on_mouse_moved(x, y, ...)
else else
self:propagate("on_mouse_moved", x, y, ...) self:propagate("on_mouse_moved", x, y, ...)
@ -250,8 +252,9 @@ local function close_button_location(x, w)
end end
function Node:tab_mouse_moved(px, py) function Node:tab_hovered_update(px, py)
local tab_index = self:get_tab_overlapping_point(px, py) local tab_index = self:get_tab_overlapping_point(px, py)
self.hovered_tab = tab_index
if tab_index then if tab_index then
local x, y, w, h = self:get_tab_rect(tab_index) local x, y, w, h = self:get_tab_rect(tab_index)
local cx, cw = close_button_location(x, w) local cx, cw = close_button_location(x, w)
@ -278,7 +281,7 @@ end
function Node:get_tab_rect(idx) function Node:get_tab_rect(idx)
local tw = math.min(style.tab_width, (self.size.x - style.padding.x) / #self.views) local tw = math.min(style.tab_width, (self.size.x - self.tab_margin) / #self.views)
local x_left = self.position.x + tw * (idx - 1) local x_left = self.position.x + tw * (idx - 1)
local x1, x2 = math.floor(x_left), math.floor(x_left + tw) local x1, x2 = math.floor(x_left), math.floor(x_left + tw)
local h = style.font:get_height() + style.padding.y * 2 local h = style.font:get_height() + style.padding.y * 2
@ -388,6 +391,8 @@ function Node:update()
for _, view in ipairs(self.views) do for _, view in ipairs(self.views) do
view:update() view:update()
end end
self:tab_hovered_update(self.hovered.x, self.hovered.y)
self:move_towards("tab_margin", style.padding.x)
else else
self.a:update() self.a:update()
self.b:update() self.b:update()
@ -635,6 +640,8 @@ function RootView:on_mouse_pressed(button, x, y, clicks)
local idx = node:get_tab_overlapping_point(x, y) local idx = node:get_tab_overlapping_point(x, y)
if idx then if idx then
if button == "middle" or node.hovered_close == idx then if button == "middle" or node.hovered_close == idx then
local _, _, tw = node:get_tab_rect(idx)
node.tab_margin = node.tab_margin + tw
node:close_view(self.root_node, node.views[idx]) node:close_view(self.root_node, node.views[idx])
else else
self.dragged_node = idx self.dragged_node = idx