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

adjust children for parent padding and margin

Browse Source
This commit is contained in:
airstruck
2015-10-25 16:01:41 -04:00
parent 8f604fb79d
commit 995825b9b3
11 changed files with 108 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
luigi/widget/sash.lua
View File

@@ -2,10 +2,10 @@ local Widget = require((...):gsub('%.[^.]*$', ''))
local Sash = Widget:extend()
function Sash:constructor(layout, data)
function Sash:constructor (layout, data)
Widget.constructor(self, layout, data)
self:onPressDrag(function(event)
self:onPressDrag(function (event)
local axis = self.parent.flow
if axis == 'x' then
dimension = 'width'

25
luigi/widget/slider.lua
View File

@@ -2,29 +2,24 @@ local Widget = require((...):gsub('%.[^.]*$', ''))
local Slider = Widget:extend()
function Slider:constructor(layout, data)
function Slider:constructor (layout, data)
Widget.constructor(self, layout, data)
local function getCenter()
return self:getX() + self:getWidth() / 2
end
self.value = 0.5
local position = 0.5
self:onPressDrag(function(event)
self:onPressDrag(function (event)
local x1, y1, x2, y2 = self:getRectangle(true, true)
position = (event.x - x1) / (x2 - x1)
if position < 0 then position = 0 end
if position > 1 then position = 1 end
self.value = (event.x - x1) / (x2 - x1)
if self.value < 0 then self.value = 0 end
if self.value > 1 then self.value = 1 end
end)
self:onDisplay(function(event)
self:onDisplay(function (event)
local x1, y1, x2, y2 = self:getRectangle(true, true)
local padding = self.padding or 0
local sx1 = math.floor(x1 + position * (x2 - x1) - padding) - 0.5
local sy1 = math.floor(y1 + padding) - 0.5
local sx1 = math.floor(x1 + self.value * (x2 - x1) - padding) + 0.5
local sy1 = math.floor(y1 + padding) + 0.5
local sx2 = padding * 2
local sy2 = y2 - y1 - padding
@@ -34,7 +29,7 @@ function Slider:constructor(layout, data)
love.graphics.rectangle('fill',
x1,
y1 + ((y2 - y1) / 2) - padding / 2,
y1 + ((y2 - y1) / 2),
x2 - x1,
padding
)

2
luigi/widget/text.lua
View File

@@ -2,7 +2,7 @@ local Widget = require((...):gsub('%.[^.]*$', ''))
local Text = Widget:extend()
function Text:constructor(layout, data)
function Text:constructor (layout, data)
Widget.constructor(self, layout, data)
end