GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style keyboard elements

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-10-15 04:02:14 +02:00
parent c4493e349a
commit a0b995c288
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
itemcontroller.lua
View File

@ -149,7 +149,8 @@ local PAGES = {
sortMode = 1, sortMode = 1,
filter = "", filter = "",
displayKeyboard = false, displayKeyboard = false,
currentPage = 1 currentPage = 1,
reloadState = function() end
}) })
local function _genSort(func, invert, tiebreaker) local function _genSort(func, invert, tiebreaker)
@ -411,24 +412,35 @@ local PAGES = {
} }
local function charInputKeyList(chars, backspace) local function charInputKeyList(chars, backspace)
local keys = {} local keys = { Element:new{ id = "LPAD", bgColor = colors.cyan, width = 0 } }
for i=1,#chars do for i=1,#chars do
local key = chars:sub(i, i) local key = chars:sub(i, i)
-- ((not backspace) and i == #keys and 0) or 1 -- ((not backspace) and i == #keys and 0) or 1
table.insert(keys, Padding:new{ bgColor = colors.black, right = 0, element = Text:new{ table.insert(keys, Padding:new{ bgColor = colors.cyan, right = 1, element = Text:new{
id = key, id = key,
text = key, text = key,
bgColor = colors.gray bgColor = colors.gray,
onClick = function()
pageState.filter = pageState.filter..key
pageState.reloadState()
return true
end
}}) }})
end end
if backspace then if backspace then
table.insert(keys, Text:new{ table.insert(keys, Text:new{
id = KEY_BACKSPACE, id = KEY_BACKSPACE,
text = "<--", text = "<--",
bgColor = colors.gray bgColor = colors.gray,
onClick = function()
pageState.filter = fitText(pageState.filter, math.max(0, #pageState.filter - 1))
pageState.reloadState()
return true
end
}) })
end end
return List:new{ return List:new{
bgColor = colors.cyan,
[Orientation:getId()] = Orientation.HORIZONTAL, [Orientation:getId()] = Orientation.HORIZONTAL,
[Children:getId()] = keys [Children:getId()] = keys
} }
@ -442,9 +454,15 @@ local PAGES = {
table.insert(keyboardLines.elements, keyLineList) table.insert(keyboardLines.elements, keyLineList)
end end
for _,line in ipairs(keyboardLines.elements) do
local pad = line:findById("LPAD")
pad:setWidth(keyboardWidth - (KEYBOARD_HPAD * 2) - line:getWidth())
end
table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY }) table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY })
local keyboardList = Padding:new{ bgColor = colors.cyan, left = KEYBOARD_HPAD, right = KEYBOARD_HPAD, element = List:new{ local keyboardList = Padding:new{ bgColor = colors.cyan, left = KEYBOARD_HPAD, right = KEYBOARD_HPAD, element = List:new{
bgColor = colors.cyan,
[Orientation:getId()] = Orientation.VERTICAL, [Orientation:getId()] = Orientation.VERTICAL,
[Children:getId()] = keyboardLines.elements [Children:getId()] = keyboardLines.elements
}} }}
@ -530,23 +548,6 @@ local PAGES = {
screenContainer:setDirty(true) screenContainer:setDirty(true)
end end
for _,line in ipairs(keyboardLines.lines) do
for i=1,#line[1] do
local key = line[1]:sub(i, i)
keyboardList:findById(key):setOnClick(function()
pageState.filter = pageState.filter..key
reloadState()
return true
end)
end
end
keyboardList:findById(KEY_BACKSPACE):setOnClick(function()
pageState.filter = fitText(pageState.filter, math.max(0, #pageState.filter - 1))
reloadState()
return true
end)
local function bindTabActionButtons() local function bindTabActionButtons()
local function onClickHandler(change) local function onClickHandler(change)
return function() return function()
@ -600,6 +601,8 @@ local PAGES = {
return true return true
end) end)
pageState.reloadState = reloadState
reloadState() reloadState()
return renderDefault(state, screenContainer) return renderDefault(state, screenContainer)