minor improvements

This commit is contained in:
airstruck
2015-12-10 16:05:54 -05:00
parent bcfed7b737
commit c8ca310811
20 changed files with 160 additions and 108 deletions

View File

@@ -32,8 +32,12 @@ local function setDimension (widget, name, size)
local parentDimension = widget.parent:calculateDimension(name)
local claimed = 0
for i, sibling in ipairs(widget.parent) do
if sibling ~= widget and sibling[name] then
claimed = claimed + sibling[name]
local value = sibling[name]
if sibling ~= widget and value then
if value == 'auto' then
value = sibling:calculateDimensionMinimum(name)
end
claimed = claimed + value
end
end
if claimed + size > parentDimension then
@@ -71,11 +75,13 @@ return function (self)
local prevSize = prevSibling and prevSibling[dimension]
local nextSize = nextSibling and nextSibling[dimension]
if prevSize then
if prevSize or not nextSize then
setDimension(prevSibling, dimension,
event[axis] - prevSibling:calculatePosition(axis))
end
if nextSize then
elseif nextSize then
if nextSize == 'auto' then
nextSize = nextSibling:calculateDimensionMinimum(dimension)
end
setDimension(nextSibling, dimension,
nextSibling:calculatePosition(axis) + nextSize - event[axis])
end

View File

@@ -12,15 +12,13 @@ return function (self)
return value < 0 and 0 or value > 1 and 1 or value
end
self.value = clamp(self.value or 0.5)
self.value = clamp(self.value or 0)
self.step = self.step or 0.01
local spacer = self:addChild()
local thumb = self:addChild {
type = 'button',
align = 'middle center',
margin = 0,
type = 'slider.thumb',
}
local function unpress ()

View File

@@ -21,9 +21,9 @@ return function (self)
self[index] = nil
end
local before = self:addChild { type = 'stepper.left' }
local view = self:addChild()
local after = self:addChild { type = 'stepper.right' }
local before = self:addChild { type = 'stepper.before' }
local view = self:addChild { type = 'stepper.view' }
local after = self:addChild { type = 'stepper.after' }
self:onReshape(function (event)
if self.flow == 'x' then

View File

@@ -182,7 +182,7 @@ return function (self)
self.fontData = Backend.Font(self.font, self.size)
end
self.value = self.value or self.text or ''
self.value = tostring(self.value or self.text or '')
self.text = ''