gfx/list.lua

@@ -12,7 +12,7 @@ local function adjustPositions(elements, vertical, from)
       newDims = newDims + getDim(elements[i])
     end
     
-    local setDim = vertical and function(e, dim) e:setY(dim) end or function(e, dim) e:setX(dim) end
+    local setDim = vertical and function(e, dim) e:setPos(1, dim) end or function(e, dim) e:setPos(dim, 1) end
     for i=from,#elements do
       setDim(elements[i], newDims)
       newDims = newDims + getDim(elements[i])

itemcontroller.lua

@@ -70,57 +70,15 @@ local function loadState(fname, node)
   return controller
 end
 
-local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage)
-  local state = savedState or {}
-  state.tab = state.tab or 1
-
-  local pages = math.ceil(#groups / (hBudget - 1))
-
-  -- Tab controls
-  local btnPrev = Text:new{
-    text = " < ",
-    bgColor = state.tab == 1 and colors.black or colors.gray,
-    fgColor = state.tab == 1 and colors.red or colors.white,
-    x = 1,
-    onClick = function(e, x, y, s)
-      if state.tab > 1 then
-        state.tab = state.tab - 1
-        setPage(nil)
-      end
-    end
-  }
-
-  local btnNext = Text:new{
-    text = " > ",
-    bgColor = state.tab == pages and colors.black or colors.gray,
-    fgColor = state.tab == pages and colors.red or colors.white,
-    x = wBudget - 3,
-    onClick = function(e, x, y, s)
-      if state.tab < pages then
-        state.tab = state.tab + 1
-        setPage(nil)
-      end
-    end
-  }
-
-  local tabLine = List:new{
-    children = {
-      btnPrev,
-      btnNext
-    },
-    vertical = false
-  }
 
+local function itemList(groups, wBudget, onClick)
   local bgColors = {
     colors.gray,
     colors.black
   }
-  local entryBudget = hBudget - tabLine:getHeight()
-  local entryStart = 1 + (state.tab - 1) * (entryBudget)
-  local entryEnd = math.min(state.tab * entryBudget, #groups)
   local entries = {}
 
-  for i=entryStart,entryEnd do
+  for i=1,#groups do
     local group = groups[i]
     local text = group:getDisplayName()
     local count = tostring(group:getItemCount())
@@ -161,29 +119,17 @@ local function itemList(groups, wBudget, hBudget, savedState, onClick, setPage)
     table.insert(entries, list)
   end
 
-  local tabLinePad = Padding:new{
-    top = hBudget - (entryEnd - entryStart) - 1,
-    element = tabLine
-  }
-
-  table.insert(entries, tabLinePad)
-
   return List:new{
     children = entries,
     vertical = true
-  }, state
+  }
 end
 
 local function updatePageRender(state, pages)
   if state.nextPage ~= nil then
-    local changingPage = state.nextPage ~= state.currentPage
     state.currentPage = state.nextPage
     state.nextPage = nil
 
-    if changingPage then
-      state.pageState = nil
-    end
-
     state._pageRender = pages[state.currentPage](state)
   end
 end
@@ -217,20 +163,15 @@ local PAGES = {
 
     table.sort(found, function(a, b) return a:getItemCount() > b:getItemCount() end)
 
-    local listResult, pageState = itemList(
+    local subset = {}
-      found,
+    for i=1,math.min(13, #found) do
-      state.width,
+      table.insert(subset, found[i])
-      state.height,
+    end
-      state.pageState,
+
-      function(element, x, y, source, group)
+    local listResult = itemList(subset, state.width, function(element, x, y, source, group)
-        print("Clicked: "..group:getDisplayName())
+      print("Clicked: "..group:getDisplayName())
-        return true
+      return true
-      end,
+    end)
-      function(page)
-        state.nextPage = page or state.currentPage
-      end
-    )
-    state.pageState = pageState
     listResult:setParent(state.monitor)
 
     return function()
@@ -260,8 +201,7 @@ local CONTROLLER_STATE = {
   height = height,
   monitor = monitor,
   nextPage = "MAIN",
-  exit = false,
+  exit = false
-  pageState = {}
 }
 
 os.queueEvent("dummy_event")