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:
commit
e646f2fb28
|
@ -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
|
||||||
|
|
|
@ -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,6 +168,7 @@ 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
|
||||||
|
if y + h >= self.position.y and y <= self.position.y + self.size.y then
|
||||||
core.push_clip_rect(x, y, w, h)
|
core.push_clip_rect(x, y, w, h)
|
||||||
x = x + style.padding.x
|
x = x + style.padding.x
|
||||||
|
|
||||||
|
@ -193,6 +208,8 @@ function LogView:draw()
|
||||||
|
|
||||||
core.pop_clip_rect()
|
core.pop_clip_rect()
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
LogView.super.draw_scrollbar(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue