Compare commits

..

No commits in common. "8197d0a6f6cfcfef3bde2c95e06fc6911b5ce77e" and "233d3119e51fcc8972b667423658730e43ad1a2a" have entirely different histories.

2 changed files with 5 additions and 54 deletions

View File

@ -60,26 +60,6 @@ function Padding:getPaddingBottom()
return self.bottom
end
local function compareSet(value, default, didChange)
return value or default, didChange or (value ~= nil and value ~= default)
end
function Padding:setPadding(opts)
if type(opts) ~= "table" then
return
end
local changed = false
self.left, changed = compareSet(opts.left, self.left, changed)
self.right, changed = compareSet(opts.right, self.right, changed)
self.top, changed = compareSet(opts.top, self.top, changed)
self.bottom, changed = compareSet(opts.bottom, self.bottom, changed)
if changed then
self:_reload()
end
end
function Padding:getInnerWidth()
return self.element:getWidth()
end

View File

@ -312,7 +312,6 @@ local PAGES = {
local group = state:getExtra()
if group == nil then
print("No group passed to GROUP_DETAIL")
state:setPage("MAIN")
return NOOP
end
@ -418,7 +417,7 @@ local PAGES = {
bgColor = colors.gray
},
onClick = function(e, x, y, s)
state:setPage("REQUEST", group)
state:setPage("REQUEST")
return true
end
}
@ -436,47 +435,19 @@ local PAGES = {
end,
REQUEST = function(state, newPage)
local group = state:getExtra()
if group == nil then
print("No group passed to REQUEST")
state:setPage("MAIN")
return NOOP
end
local paddingSide = 0
local paddingTop = 0
local itemName = fitText(group:getSimpleName(), state.width - (paddingSide * 2))
local itemLeftPad, itemRightPad = getCenterPad(#itemName, state.width - (paddingSide * 2))
local paddedTitle = Padding:new{
top = 1,
left = itemLeftPad,
right = itemRightPad,
bottom = 1,
element = Text:new{
id = "title",
text = itemName,
bgColor = colors.gray
},
bgColor = colors.gray,
onClick = function(e, x, y, s)
local title = e:findById("title")
title:setText("Clicked")
local newLeftPad, newRightPad = getCenterPad(#("Clicked"), state.width - (paddingSide * 2))
e:setPadding{ left = newLeftPad, right = newRightPad }
return true
end
local helloPage = Text:new{
text = "Hello Request"
}
local stuffContainer = Container:new{
[Children:getId()] = {
paddedTitle
helloPage
},
width = state.width,
height = state.height,
parent = state.monitor,
onClick = function(e, x, y, s)
state:setPage("GROUP_DETAIL", group)
state:setPage("GROUP_DETAIL")
return true
end
}