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

StatusView: implemented and applied get_item_visible_area.

This commit is contained in:
jgmdev 2022-02-24 02:23:29 -04:00
parent b1ce685489
commit 131bdf9fb2
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
data/core/statusview.lua
View File

@ -776,6 +776,41 @@ function StatusView:get_hovered_panel(x, y)
end end
---@param item StatusView.Item
---@return number x
---@return number w
function StatusView:get_item_visible_area(item)
local item_ox = item.alignment == StatusView.Item.LEFT and
self.left_xoffset or self.right_xoffset
local item_x = item_ox + item.x + style.padding.x
local item_w = item.w
if item.alignment == StatusView.Item.LEFT then
if self.left_width - item_x > 0 and self.left_width - item_x < item.w then
item_w = (self.left_width + style.padding.x) - item_x
elseif self.left_width - item_x < 0 then
item_x = 0
item_w = 0
end
else
local rx = self.size.x - self.right_width - style.padding.x
if item_x < rx then
if item_x + item.w > rx then
item_x = rx
item_w = (item_x + item.w) - rx
else
item_x = 0
item_w = 0
end
end
end
return item_x, item_w
end
function StatusView:on_mouse_pressed(button, x, y, clicks) function StatusView:on_mouse_pressed(button, x, y, clicks)
core.set_active_view(core.last_active_view) core.set_active_view(core.last_active_view)
if if
@ -819,12 +854,9 @@ function StatusView:on_mouse_moved(x, y, dx, dy)
and and
(item.command or item.on_click or item.tooltip ~= "") (item.command or item.on_click or item.tooltip ~= "")
then then
local item_ox = item.alignment == StatusView.Item.LEFT and local item_x, item_w = self:get_item_visible_area(item)
self.left_xoffset or self.right_xoffset
local item_x = item_ox + item.x + style.padding.x if x > item_x and (item_x + item_w) > x then
if x > item_x and (item_x + item.w) > x then
self.pointer.x = x self.pointer.x = x
self.pointer.y = y self.pointer.y = y
if self.hovered_item ~= item then if self.hovered_item ~= item then
@ -856,10 +888,9 @@ function StatusView:on_mouse_released(button, x, y)
if y < self.position.y or not self.hovered_item.active then return end if y < self.position.y or not self.hovered_item.active then return end
local item = self.hovered_item local item = self.hovered_item
local item_ox = item.alignment == StatusView.Item.LEFT and local item_x, item_w = self:get_item_visible_area(item)
self.left_xoffset or self.right_xoffset
local item_x = item_ox + item.x + style.padding.x if x > item_x and (item_x + item_w) > x then
if x > item_x and (item_x + item.w) > x then
if item.command then if item.command then
command.perform(item.command) command.perform(item.command)
elseif item.on_click then elseif item.on_click then