From e70537142e4cf1935fd2fc832e65602fdb1bb29e Mon Sep 17 00:00:00 2001 From: Lorenzo Cogotti Date: Tue, 16 Aug 2022 09:49:14 +0200 Subject: [PATCH] [columns,rows] Remove superfluous widget types, leave containers as Layouts. --- columns.lua | 7 ++----- rows.lua | 9 +++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/columns.lua b/columns.lua index ff215a7..da4b6b5 100644 --- a/columns.lua +++ b/columns.lua @@ -2,9 +2,6 @@ local BASE = (...):gsub('columns', '') local Layout = require(BASE..'layout') -local Columns = setmetatable({}, Layout) -Columns.__index = Columns - -- Advance position to next column, -- given current position, widget dimensions and padding. @@ -12,8 +9,8 @@ local function columnadvance(x,y, ww,wh, padding) return x + ww + padding, y end -function Columns.new(args) - local self = setmetatable(Layout.new(args), Columns) +function Columns(args) + local self = Layout.new(args) self.advance = columnadvance self.prev = 'left' diff --git a/rows.lua b/rows.lua index d3005d4..07bc97f 100644 --- a/rows.lua +++ b/rows.lua @@ -1,10 +1,7 @@ -local BASE = (...):gsub('rows') +local BASE = (...):gsub('rows', '') local Layout = require(BASE..'layout') -local Rows = setmetatable({}, Layout) -Rows.__index = Rows - -- Advance position to next row, -- given current position, widget dimensions and padding. @@ -12,8 +9,8 @@ local function rowadvance(x,y, ww,wh, padding) return x, y + wh + padding end -function Rows.new(args) - local self = setmetatable(Layout.new(args), Rows) +function Rows(args) + local self = Layout.new(args) self.advance = rowadvance self.prev = 'up'