Simplify lists and visibility

gfx/container.lua

@@ -38,17 +38,4 @@ function Container:setStrict(strict)
   end
 end
 
-function Container:_reload()
-  Element._reload(self)
-
-  -- Reload child windows
-  local win = self:_getWindow()
-  for _,child in self:_iterateChildren() do
-    if child:_getWindow() ~= win then
-      child:setParent(win)
-      child:_reload()
-    end
-  end
-end
-
 return Container

gfx/element.lua

@@ -121,10 +121,13 @@ function Element:_getWindow()
 end
 
 function Element:_setWindow(window)
+  self:setDirty()
   self.window = window
 end
 
 function Element:setVisible(visible)
+  self:setDirty()
+  self.visible = visible
   self:_getWindow().setVisible(visible)
 end
 
@@ -189,10 +192,6 @@ function Element:getId()
   return self.id
 end
 
-function Element:redraw()
-  self:_getWindow().redraw()
-end
-
 function Element:handleEvent(evt)
   if Event.isClickEvent(evt) and Event.containsClick(self, evt) and self.onClick ~= nil then
     local x, y, source = Event.getClickParams(evt)
@@ -210,6 +209,7 @@ function Element:_reload()
     local win = window.create(self.parent, self:getX(), self:getY(), self:getWidth(), self:getHeight(), self:isVisible())
     win.setBackgroundColor(self:getBgColor())
     win.setTextColor(self:getFgColor())
+    win.setVisible(self.visible)
     self:_setWindow(win)
   end
 end

gfx/list.lua

@@ -57,16 +57,6 @@ function List:getWidth()
 end
 
 function List:_reload()
-  Element._reload(self)
-
-  -- Reload child windows
-  local win = self:_getWindow()
-  for _,child in self:_iterateChildren() do
-    if child:_getWindow() ~= win then
-      child:setParent(win)
-    end
-  end
-
   self:adjustPositions()
 end
 

gfx/prop/children.lua

@@ -5,6 +5,7 @@ local Children = Prop:new{ defaultState = {}, uid = "CHILDREN" }
 
 function Children:with(elementType)
   local propSelf = self
+  local defaultReload = elementType._reload
   function elementType:_iterateChildren()
     return ipairs(self:_children())
   end
@@ -147,6 +148,22 @@ function Children:with(elementType)
     return Element.handleEvent(self, evt)
   end
 
+  function elementType:_reload()
+    Element._reload(self)
+  
+    -- Reload child windows
+    local win = self:_getWindow()
+    for _,child in self:_iterateChildren() do
+      if child:_getWindow() ~= win then
+        child:setParent(win)
+      end
+    end
+
+    if defaultReload ~= nil and defaultReload ~= Element._reload then
+      defaultReload(self)
+    end
+  end
+
   return elementType
 end
 

itemcontroller.lua

@@ -10,7 +10,7 @@ local Element = require("gfx.element")
 local Progress = require("gfx.progress")
 local Prop = require("gfx.prop")
 local Children = require("gfx.prop.children")
-local Visibility = require("gfx.prop.visibility")
+--local Visibility = require("gfx.prop.visibility")
 local Orientation = require("gfx.prop.orientation")
 
 
@@ -232,6 +232,7 @@ local function renderDefault(state, rootElement)
   
         -- Trigger re-render
         rootElement:setDirty(true)
+        rootElement:_reload()
       end
     end
   
@@ -266,7 +267,7 @@ local PAGES = {
     local pageState = state:currentPageState({
       sortMode = 1,
       filter = "",
-      displayKeyboard = Visibility.INVISIBLE,
+      displayKeyboard = true,
       currentPage = 1
     })
 
@@ -434,7 +435,7 @@ local PAGES = {
     }
 
     for i=#actions+1,1,-1 do
-      table.insert(actions, i, Element:new{ width = 0, height = 1 })
+      table.insert(actions, i, Element:new{ width = 0 })
     end
 
     local bottomBarList = List:new {
@@ -452,7 +453,7 @@ local PAGES = {
         usedSpace = usedSpace + actions[i]:getWidth()
       end
 
-      local barWidth = bottomBarList:getWidth()
+      local barWidth = state.width
       local freeSpace = barWidth - usedSpace
       local asymmetry = freeSpace % ((#actions + 1) / 2)
       local part = (freeSpace - asymmetry) / ((#actions + 1) / 2)
@@ -488,26 +489,22 @@ local PAGES = {
       local bgColor = (i % 2 == 0) and colors.gray or colors.black
       table.insert(
         entries,
-        Prop.attach(
+        List:new{
-          List:new{
+          id = tostring(i),
-            id = tostring(i),
+          bgColor = bgColor,
-            bgColor = bgColor,
+          [Orientation:getId()] = Orientation.HORIZONTAL,
-            [Orientation:getId()] = Orientation.HORIZONTAL,
+          [Children:getId()] = {
-            [Children:getId()] = {
+            Padding:new{
-              Padding:new{
+              id = GroupEntryID.PADDING,
-                id = GroupEntryID.PADDING,
+              bgColor = bgColor,
-                bgColor = bgColor,
+              element = Text:new{ id = GroupEntryID.NAME, bgColor = bgColor }
-                element = Text:new{ id = GroupEntryID.NAME, bgColor = bgColor }
+            },
-              },
+            Text:new{
-              Text:new{
+              id = GroupEntryID.COUNT,
-                id = GroupEntryID.COUNT,
+              bgColor = bgColor
-                bgColor = bgColor
-              }
             }
-          },
+          }
-          Visibility,
+        }
-          Visibility.INVISIBLE
-        )
     )
     end
 
@@ -566,7 +563,7 @@ local PAGES = {
       table.insert(keyboardLines.elements, keyLineList)
     end
 
-    table.insert(keyboardLines.elements, 1, Text:new{ id = ID_FILTER_DISPLAY, text = "" })
+    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{
       [Orientation:getId()] = Orientation.Vertical,
@@ -576,7 +573,7 @@ local PAGES = {
     local screenContainer = Container:new{
       [Children:getId()] = {
         mainList,
-        Prop.attach(keyboardList, Visibility, pageState.displayKeyboard)
+        keyboardList
       }
     }