mirrors/love-luigi
1
0
Fork 0
mirror of https://github.com/airstruck/luigi.git synced 2025-12-19 02:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

add horizontal scrolling, fix #3

Browse Source
This commit is contained in:
airstruck
2016-01-28 16:17:33 -05:00
parent 93e619862e
commit bbbdccb3b5
3 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
luigi/widget.lua
View File

@@ -787,18 +787,33 @@ function Widget:reshape ()
self.isReshaping = nil
end
function Widget:scrollBy (x, y)
function Widget:scrollBy (amount)
if not self.scroll then return end
if not self.scrollY then self.scrollY = 0 end
local scrollY = self.scrollY - y * 10
local inner = math.max(self:getContentHeight(), self.innerHeight or 0)
local maxY = inner - self:getHeight()
+ (self.padding or 0) * 2 + (self.margin or 0) * 2
scrollY = math.max(math.min(scrollY, maxY), 0)
if scrollY ~= self.scrollY then
self.scrollY = scrollY
self:reshape()
return true
--TODO: eliminate redundancy
if self.flow == 'x' then
if not self.scrollX then self.scrollX = 0 end
local scrollX = self.scrollX - amount * 10
local inner = math.max(self:getContentWidth(), self.innerWidth or 0)
local maxX = inner - self:getWidth()
+ (self.padding or 0) * 2 + (self.margin or 0) * 2
scrollX = math.max(math.min(scrollX, maxX), 0)
if scrollX ~= self.scrollX then
self.scrollX = scrollX
self:reshape()
return true
end
else
if not self.scrollY then self.scrollY = 0 end
local scrollY = self.scrollY - amount * 10
local inner = math.max(self:getContentHeight(), self.innerHeight or 0)
local maxY = inner - self:getHeight()
+ (self.padding or 0) * 2 + (self.margin or 0) * 2
scrollY = math.max(math.min(scrollY, maxY), 0)
if scrollY ~= self.scrollY then
self.scrollY = scrollY
self:reshape()
return true
end
end
end