gfx/element.lua

@@ -165,7 +165,7 @@ function Element:isVisible()
   return self.visible
 end
 
-function Element:setDirty(fullInvalidate)
+function Element:setDirty()
   self.dirty = true
 end
 

gfx/list.lua

@@ -66,15 +66,6 @@ function List:isHorizontal()
   return not self:isVertical()
 end
 
-function List:setDirty(fullInvalidate)
-  Element.setDirty(self, fullInvalidate)
-  if fullInvalidate then
-    for _,child in self.children do
-      child:setDirty(fullInvalidate)
-    end
-  end
-end
-
 function List:draw()
   local dirty = Element.draw(self)
   if dirty then

gfx/padding.lua

@@ -37,13 +37,6 @@ function Padding:draw()
   return false
 end
 
-function Padding:setDirty(fullInvalidate)
-  Element.setDirty(self, fullInvalidate)
-  if fullInvalidate then
-    self.element:setDirty(fullInvalidate)
-  end
-end
-
 function Padding:getPaddingLeft()
   return self.left
 end

itemcontroller.lua

@@ -70,7 +70,15 @@ local function loadState(fname, node)
 end
 
 
-local function itemList(groups, wBudget, onClick)
+local accessNode = Chest:fromPeripheral("minecraft:trapped_chest", true)
+---@diagnostic disable-next-line: need-check-nil
+local controller = loadState(CACHE_FILE, accessNode:getInventory())
+local monitor = peripheral.find("monitor")
+
+local width, height = monitor.getSize()
+
+
+local function itemList(groups, wBudget)
   local bgColors = {
     colors.gray,
     colors.black
@@ -111,7 +119,9 @@ local function itemList(groups, wBudget, onClick)
         countLabel
       },
       vertical = false,
-      onClick = onClick
+      onClick = function(table, x, y, source)
+        print("Clicked: "..group:getDisplayName())
+      end
     }
     table.insert(entries, list)
   end
@@ -122,79 +132,18 @@ local function itemList(groups, wBudget, onClick)
   }
 end
 
-local function renderDefault(state, rootElement)
+local found = ItemGroup.collectStacks(controller:find(function(stack)
-  local event = {os.pullEvent()}
-  local handled = rootElement:handleEvent(event)
-  if not handled and event[1] == "monitor_resize" then
-    local width, height = state.monitor.getSize()
-    if state.width ~= width or state.height ~= height then
-      state.width = width
-      state.height = height
-
-      -- Trigger re-render
-      rootElement:setDirty(true)
-    end
-  end
-
-  if not handled then
-    os.queueEvent(table.unpack(event))
-  end
-end
-
-local PAGES = {
-  MAIN = function(state)
-    local found = ItemGroup.collectStacks(state.controller:find(function(stack)
   return not stack:isEmpty()
-    end))
+end))
 
-    table.sort(found, function(a, b) return a:getItemCount() > b:getItemCount() end)
+table.sort(found, function(a, b) return a:getItemCount() > b:getItemCount() end)
 
-    local subset = {}
+local subset = {}
-    for i=1,math.min(13, #found) do
+for i=1,math.min(13, #found) do
   table.insert(subset, found[i])
-    end
-
-    local listResult = itemList(subset, state.width, function(group, x, y, source)
-      print("Clicked: "..group:getDisplayName())
-    end)
-    listResult:setParent(state.monitor)
-
-    return function()
-      renderDefault(state, listResult)
-    end
-  end,
-
-  GROUP_DETAIL = function(state)
-
-  end,
-
-  REQUEST = function(state)
-
-  end
-}
-
-
-local accessNode = Chest:fromPeripheral("minecraft:trapped_chest", true)
----@diagnostic disable-next-line: need-check-nil
-local controller = loadState(CACHE_FILE, accessNode:getInventory())
-local monitor = peripheral.find("monitor")
-local width, height = monitor.getSize()
-
-local CONTROLLER_STATE = {
-  controller = controller,
-  width = width,
-  height = height,
-  monitor = monitor,
-  currentPage = "MAIN",
-  exit = false
-}
-
-os.queueEvent("dummy_event")
-while not CONTROLLER_STATE.exit do
-  PAGES[CONTROLLER_STATE.currentPage](CONTROLLER_STATE)
-
-  if CONTROLLER_STATE.nextPage ~= nil then
-    CONTROLLER_STATE.currentPage = CONTROLLER_STATE.nextPage
-    CONTROLLER_STATE.nextPage = nil
-  end
 end
+
+local listResult = itemList(subset, width)
+
+listResult:setParent(monitor)
+listResult:draw()