Do a quick pass over widget's self.dimen

Doesn't appear to be any rhyme or reason re: init vs. paintTo, wheee! Anyway, fill the Geom tables we create to make sure we won't need to grow it later while I'm there.
NiLuJe · Oct 5, 2022 · 4dca3ce · 4dca3ce
1 parent 5904b6c
commit 4dca3ce
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 9 deletions.
diff --git a/frontend/ui/widget/bookmapwidget.lua b/frontend/ui/widget/bookmapwidget.lua
@@ -103,7 +103,7 @@ end
 
 function BookMapRow:init()
     local _mirroredUI = BD.mirroredUILayout()
-    self.dimen = Geom:new{ w = self.width, h = self.height }
+    self.dimen = Geom:new{ x = 0, y = 0, w = self.width, h = self.height }
 
     -- Keep one span_height under baseline (frame bottom border) for indicators (current page, bookmarks)
     self.pages_frame_height = self.height - self.span_height
@@ -539,6 +539,8 @@ function BookMapWidget:init()
 
     -- Compute non-settings-dependant sizes and options
     self.dimen = Geom:new{
+        x = 0,
+        y = 0,
         w = Screen:getWidth(),
         h = Screen:getHeight(),
     }

diff --git a/frontend/ui/widget/container/movablecontainer.lua b/frontend/ui/widget/container/movablecontainer.lua
@@ -106,7 +106,7 @@ function MovableContainer:paintTo(bb, x, y)
 
     local content_size = self[1]:getSize()
     if not self.dimen then
-        self.dimen = Geom:new{w = content_size.w, h = content_size.h}
+        self.dimen = Geom:new{x = 0, y = 0, w = content_size.w, h = content_size.h}
     end
 
     self._orig_x = x

diff --git a/frontend/ui/widget/keyvaluepage.lua b/frontend/ui/widget/keyvaluepage.lua
@@ -66,7 +66,7 @@ local KeyValueItem = InputContainer:extend{
 }
 
 function KeyValueItem:init()
-    self.dimen = Geom:new{ w = self.width, h = self.height }
+    self.dimen = Geom:new{ x = 0, y = 0, w = self.width, h = self.height }
 
     -- self.value may contain some control characters (\n \t...) that would
     -- be rendered as a square. Replace them with a shorter and nicer '|'.
@@ -288,6 +288,8 @@ local KeyValuePage = FocusManager:extend{
 
 function KeyValuePage:init()
     self.dimen = Geom:new{
+        x = 0,
+        y = 0,
         w = self.width or Screen:getWidth(),
         h = self.height or Screen:getHeight(),
     }

diff --git a/frontend/ui/widget/listview.lua b/frontend/ui/widget/listview.lua
@@ -58,7 +58,7 @@ function ListView:init()
     if #self.items <= 0 then return end
 
     self.show_page = 1
-    self.dimen = Geom:new{w = self.width, h = self.height}
+    self.dimen = Geom:new{x = 0, y = 0, w = self.width, h = self.height}
 
     if Device:isTouchDevice() then
         self.ges_events.Swipe = {

diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua
@@ -642,7 +642,7 @@ function Menu:init()
     self.show_parent = self.show_parent or self
     self.item_table = self.item_table or {}
     self.item_table_stack = {}
-    self.dimen = Geom:new{ w = self.width, h = self.height or Screen:getHeight() }
+    self.dimen = Geom:new{ x = 0, y = 0, w = self.width, h = self.height or Screen:getHeight() }
     if self.dimen.h > Screen:getHeight() or self.dimen.h == nil then
         self.dimen.h = Screen:getHeight()
     end

diff --git a/frontend/ui/widget/networksetting.lua b/frontend/ui/widget/networksetting.lua
@@ -110,7 +110,7 @@ local NetworkItem = InputContainer:extend{
 }
 
 function NetworkItem:init()
-    self.dimen = Geom:new{w = self.width, h = self.height}
+    self.dimen = Geom:new{x = 0, y = 0, w = self.width, h = self.height}
     if not self.info.ssid then
         self.info.ssid = "[hidden]"
     end

diff --git a/frontend/ui/widget/physicalkeyboard.lua b/frontend/ui/widget/physicalkeyboard.lua
@@ -60,6 +60,8 @@ function PhysicalNumericKey:init()
         },
     }
     self.dimen = Geom:new{
+        x = 0,
+        y = 0,
         w = self.width,
         h = self.height,
     }
@@ -85,7 +87,7 @@ function PhysicalKeyboard:init()
         KeyPress = { { all_keys }, }
     }
 
-    self.dimen = Geom:new{ w = 0, h = 0 }
+    self.dimen = Geom:new{ x = 0, y = 0, w = 0, h = 0 }
 
     self:setType(self.inputbox.input_type)
 end

diff --git a/frontend/ui/widget/sortwidget.lua b/frontend/ui/widget/sortwidget.lua
@@ -34,7 +34,7 @@ local SortItemWidget = InputContainer:extend{
 }
 
 function SortItemWidget:init()
-    self.dimen = Geom:new{w = self.width, h = self.height}
+    self.dimen = Geom:new{x = 0, y = 0, w = self.width, h = self.height}
     self.ges_events.Tap = {
         GestureRange:new{
             ges = "tap",
@@ -135,6 +135,8 @@ function SortWidget:init()
     self.orig_item_table = nil
 
     self.dimen = Geom:new{
+        x = 0,
+        y = 0,
         w = self.width or Screen:getWidth(),
         h = self.height or Screen:getHeight(),
     }

diff --git a/frontend/ui/widget/titlebar.lua b/frontend/ui/widget/titlebar.lua
@@ -340,6 +340,8 @@ function TitleBar:init()
     end
 
     self.dimen = Geom:new{
+        x = 0,
+        y = 0,
         w = self.width,
         h = self.titlebar_height, -- buttons can overflow this
     }

diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua
@@ -423,7 +423,7 @@ function TouchMenuBar:init()
             self.bar_sep
         },
     }
-    self.dimen = Geom:new{ w = self.width, h = self.height }
+    self.dimen = Geom:new{ x = 0, y = 0, w = self.width, h = self.height }
 end
 
 function TouchMenuBar:switchToTab(index)