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

Extend `View` to allow horizontal scrolling

This commit is contained in:
Guldoman 2021-08-23 05:39:30 +02:00 committed by Francesco
parent e52362e55f
commit f1ca00fbed
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/core/view.lua
View File

@ -3,6 +3,7 @@ local config = require "core.config"
local style = require "core.style" local style = require "core.style"
local common = require "core.common" local common = require "core.common"
local Object = require "core.object" local Object = require "core.object"
local keymap = require "core.keymap"
local View = Object:extend() local View = Object:extend()
@ -50,9 +51,9 @@ function View:get_name()
return "---" return "---"
end end
-- Returns `y, x` for compatibility
function View:get_scrollable_size() function View:get_scrollable_size()
return math.huge return math.huge, 0 -- TODO: invert y and x
end end
@ -103,9 +104,13 @@ function View:on_text_input(text)
end end
function View:on_mouse_wheel(y) function View:on_mouse_wheel(quant)
if self.scrollable then if self.scrollable then
self.scroll.to.y = self.scroll.to.y + y * -config.mouse_wheel_scroll if keymap.modkeys["shift"] then
self.scroll.to.x = self.scroll.to.x + quant * -config.mouse_wheel_scroll
else
self.scroll.to.y = self.scroll.to.y + quant * -config.mouse_wheel_scroll
end
end end
end end
@ -125,8 +130,12 @@ end
function View:clamp_scroll_position() function View:clamp_scroll_position()
local max = self:get_scrollable_size() - self.size.y local scrollsize_y, scrollsize_x = self:get_scrollable_size()
self.scroll.to.y = common.clamp(self.scroll.to.y, 0, max) scrollsize_x = scrollsize_x or 0 -- FIXME: not every subclass returns the second value
local max_x = scrollsize_x - self.size.x
local max_y = scrollsize_y - self.size.y
self.scroll.to.x = common.clamp(self.scroll.to.x, 0, max_x)
self.scroll.to.y = common.clamp(self.scroll.to.y, 0, max_y)
end end