From 82ed6ed9242675313e1835b18356b2b1e91fb4b0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 12 Jun 2021 09:02:09 +0200 Subject: workspace: pass the desktop to desktop:view signal Not its index. This is more convenient to use. --- rc.lua | 2 +- workspace.lua | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rc.lua b/rc.lua index 4460166..011218f 100644 --- a/rc.lua +++ b/rc.lua @@ -103,7 +103,7 @@ for s in screen do wsp.signals:connect_signal("desktop:view", function(signals, view_screen, desktop) if view_screen == s then - pgr:set_desktop(wsp.desktops[desktop]) + pgr:set_desktop(desktop) end end) diff --git a/workspace.lua b/workspace.lua index 1522d68..63fad94 100644 --- a/workspace.lua +++ b/workspace.lua @@ -113,10 +113,11 @@ function Workspace:view(screen, desktop_idx, page_idx) self.screen_state[screen_other] = state_cur desktop.screen_map[page_idx] = screen - self.signals:emit_signal("desktop:view", screen, desktop_idx) + self.signals:emit_signal("desktop:view", screen, desktop) if state_cur then self.desktops[state_cur.desktop_idx].screen_map[state_cur.page_idx] = screen_other - self.signals:emit_signal("desktop:view", screen_other, state_cur.desktop_idx) + self.signals:emit_signal("desktop:view", screen_other, + self.desktops[state_cur.desktop_idx]) end else -- mark previous page as free @@ -131,7 +132,7 @@ function Workspace:view(screen, desktop_idx, page_idx) desktop.screen_map[page_idx] = screen self.screen_state[screen] = { page_idx = page_idx, desktop_idx = desktop_idx } - self.signals:emit_signal("desktop:view", screen, desktop_idx) + self.signals:emit_signal("desktop:view", screen, desktop) end self:_apply_state() -- cgit v1.2.3