gfx/container.lua

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