From b2e5bbc1a66395113876b53a0a91c4ad68548e77 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Fri, 14 Apr 2023 17:02:01 +0200 Subject: [PATCH] feat: unified the logic of clocks with sensors. Now all clocks will be visible in the popup, enabling/disabling some of the clock will remove the clock from the widget (#1405) --- Modules/Clock/main.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Modules/Clock/main.swift b/Modules/Clock/main.swift index b3b4267f..aa8aa1f8 100644 --- a/Modules/Clock/main.swift +++ b/Modules/Clock/main.swift @@ -71,12 +71,14 @@ public class Clock: Module { } private func callback(_ value: Date) { - var clocks: [Clock_t] = self.list.filter({ $0.enabled }) - var list: [Stack_t] = [] + var clocks: [Clock_t] = self.list + var widgetList: [Stack_t] = [] for (i, c) in clocks.enumerated() { clocks[i].value = value - list.append(Stack_t(key: c.name, value: clocks[i].formatted())) + if c.enabled { + widgetList.append(Stack_t(key: c.name, value: clocks[i].formatted())) + } } DispatchQueue.main.async(execute: { @@ -85,7 +87,7 @@ public class Clock: Module { self.menuBar.widgets.filter{ $0.isActive }.forEach { (w: Widget) in switch w.item { - case let widget as SensorsWidget: widget.setValues(list) + case let widget as SensorsWidget: widget.setValues(widgetList) default: break } }