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

Merge pull request #1065 from Guldoman/PR_log_size 

Increase `config.max_log_items`, add a scrollbar and optimize `LogView`
This commit is contained in:
Jefferson González 2022-07-05 18:07:33 -04:00 committed by GitHub
parent f49fd1b477 7888bf08e9
commit e646f2fb28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/core/config.lua
View File

@ -1,7 +1,7 @@
local config = {} local config = {}
config.fps = 60 config.fps = 60
config.max_log_items = 80 config.max_log_items = 800
config.message_timeout = 5 config.message_timeout = 5
config.mouse_wheel_scroll = 50 * SCALE config.mouse_wheel_scroll = 50 * SCALE
config.animate_drag_scroll = false config.animate_drag_scroll = false

77
data/core/logview.lua
View File

@ -1,5 +1,6 @@
local core = require "core" local core = require "core"
local common = require "core.common" local common = require "core.common"
local config = require "core.config"
local keymap = require "core.keymap" local keymap = require "core.keymap"
local style = require "core.style" local style = require "core.style"
local View = require "core.view" local View = require "core.view"
@ -81,6 +82,19 @@ function LogView:each_item()
end end
function LogView:get_scrollable_size()
local _, y_off = self:get_content_offset()
local last_y, last_h = 0, 0
for i, item, x, y, w, h in self:each_item() do
last_y, last_h = y, h
end
if not config.scroll_past_end then
return last_y + last_h - y_off + style.padding.y
end
return last_y + self.size.y - y_off
end
function LogView:on_mouse_pressed(button, px, py, clicks) function LogView:on_mouse_pressed(button, px, py, clicks)
if LogView.super.on_mouse_pressed(self, button, px, py, clicks) then if LogView.super.on_mouse_pressed(self, button, px, py, clicks) then
return true return true
@ -154,45 +168,48 @@ function LogView:draw()
local tw = style.font:get_width(datestr) local tw = style.font:get_width(datestr)
for _, item, x, y, w, h in self:each_item() do for _, item, x, y, w, h in self:each_item() do
core.push_clip_rect(x, y, w, h) if y + h >= self.position.y and y <= self.position.y + self.size.y then
x = x + style.padding.x core.push_clip_rect(x, y, w, h)
x = x + style.padding.x
x = common.draw_text( x = common.draw_text(
style.icon_font, style.icon_font,
style.log[item.level].color, style.log[item.level].color,
style.log[item.level].icon, style.log[item.level].icon,
"center", "center",
x, y, iw, lh x, y, iw, lh
) )
x = x + style.padding.x x = x + style.padding.x
-- timestamps are always 15% of the width -- timestamps are always 15% of the width
local time = os.date(nil, item.time) local time = os.date(nil, item.time)
common.draw_text(style.font, style.dim, time, "left", x, y, tw, lh) common.draw_text(style.font, style.dim, time, "left", x, y, tw, lh)
x = x + tw + style.padding.x x = x + tw + style.padding.x
w = w - (x - self:get_content_offset()) w = w - (x - self:get_content_offset())
if is_expanded(item) then if is_expanded(item) then
y = y + common.round(style.padding.y / 2) y = y + common.round(style.padding.y / 2)
_, y = draw_text_multiline(style.font, item.text, x, y, style.text) _, y = draw_text_multiline(style.font, item.text, x, y, style.text)
local at = "at " .. common.home_encode(item.at) local at = "at " .. common.home_encode(item.at)
_, y = common.draw_text(style.font, style.dim, at, "left", x, y, w, lh) _, y = common.draw_text(style.font, style.dim, at, "left", x, y, w, lh)
if item.info then if item.info then
_, y = draw_text_multiline(style.font, item.info, x, y, style.dim) _, y = draw_text_multiline(style.font, item.info, x, y, style.dim)
end
else
local line, has_newline = string.match(item.text, "([^\n]+)(\n?)")
if has_newline ~= "" then
line = line .. " ..."
end
_, y = common.draw_text(style.font, style.text, line, "left", x, y, w, lh)
end end
else
local line, has_newline = string.match(item.text, "([^\n]+)(\n?)") core.pop_clip_rect()
if has_newline ~= "" then
line = line .. " ..."
end
_, y = common.draw_text(style.font, style.text, line, "left", x, y, w, lh)
end end
core.pop_clip_rect()
end end
LogView.super.draw_scrollbar(self)
end end