From 180fb7eb8790491c4476fafffe04b27998796f18 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 7 Nov 2020 10:08:30 +0100
Subject: pager: drop now-unnecessary init_data table

---
 pager.lua | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'pager.lua')

diff --git a/pager.lua b/pager.lua
index 91c22c6..9bfd611 100644
--- a/pager.lua
+++ b/pager.lua
@@ -36,14 +36,14 @@ function Page:update()
         client:connect_signal("property::name", function() tb:set_text(client.name or "") end)
         client:connect_signal("focus",
             function(c)
-                if c.screen == self.pager.init_data.screen then
+                if c.screen == self.pager.screen then
                     bg:set_bg(bg_focus)
                     bg:set_fg(fg_focus)
                 end
             end)
         client:connect_signal("unfocus",
             function(c)
-                if c.screen == self.pager.init_data.screen then
+                if c.screen == self.pager.screen then
                     bg:set_bg(bg_normal)
                     bg:set_fg(fg_normal)
                 end
@@ -83,7 +83,7 @@ end
 local Pager = {}
 
 function Pager:_set_active(screen, page_idx)
-    if self.init_data.screen == screen then
+    if self.screen == screen then
         if self.active_page then
             self.active_page:set_active(false)
         end
@@ -98,9 +98,7 @@ function Pager:set_desktop(desktop)
         return
     end
 
-    local init_data = self.init_data
-
-    print("pager " .. init_data.screen.index .. " set desktop")
+    print("pager " .. self.screen.index .. " set desktop")
 
     self.widget:reset()
 
@@ -108,7 +106,7 @@ function Pager:set_desktop(desktop)
     self.pages       = {}
 
     local nb_pages = #desktop.pages
-    local page_height = self.init_data.height / nb_pages
+    local page_height = self.height / nb_pages
 
     local title = wibox.widget.textbox(desktop.name, false)
     title:set_align("center")
@@ -126,7 +124,7 @@ function Pager:set_desktop(desktop)
 
     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.pages[i] = Page:new(page, i, self.width, page_height, self)
         self.widget:add(self.pages[i].widget)
     end
 
@@ -143,7 +141,9 @@ function Pager:new(screen, width, height)
 
     ret.widget = wibox.layout.fixed.vertical()
 
-    ret.init_data = { screen = screen, width = width, height = height }
+    ret.screen = screen
+    ret.width  = width
+    ret.height = height
 
     return ret
 end
-- 
cgit v1.2.3