From 6278762a25c530c49aae911b770a252c87069a3c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 20 Jun 2020 09:39:37 +0200 Subject: pager: do not inherit from widget, rather make it a property --- pager.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pager.lua') diff --git a/pager.lua b/pager.lua index 7bb4e97..ee2eebb 100644 --- a/pager.lua +++ b/pager.lua @@ -95,10 +95,7 @@ local function pager_set_desktop(self, desktop) print("pager " .. init_data.screen.index .. " set desktop") - self:reset() - - self.init_data = init_data - self.set_desktop = pager_set_desktop + self.widget:reset() self.active_page = nil self.pages = {} @@ -118,12 +115,12 @@ local function pager_set_desktop(self, desktop) title:set_text(name) end) - self:add(title_container) + self.widget:add(title_container) for i = 1, nb_pages do local page = desktop.pages[i] self.pages[i] = Page:new(page, i, self.init_data.width, page_height, self) - self:add(self.pages[i].widget) + self.widget:add(self.pages[i].widget) end desktop:connect_signal("page:view", @@ -134,12 +131,15 @@ end local Pager = {} function Pager:new(screen, width, height) - local pager = wibox.layout.fixed.vertical() + local ret = setmetatable({}, self) + self.__index = self - pager.init_data = { screen = screen, width = width, height = height } - pager.set_desktop = pager_set_desktop + ret.widget = wibox.layout.fixed.vertical() - return pager + ret.init_data = { screen = screen, width = width, height = height } + ret.set_desktop = pager_set_desktop + + return ret end M.Pager = Pager -- cgit v1.2.3