From 1cb1b94ad26c4592d2481ffe98e1b4cfc4a374bb Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Wed, 24 Jan 2024 22:57:31 +0700
Subject: [PATCH] make indicators (more likely to work with) multimonitor

---
 .config/ags/widgets/indicators/colorscheme.js |  4 +--
 .config/ags/widgets/indicators/main.js        |  4 +--
 .../widgets/indicators/notificationpopups.js  | 34 +------------------
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/.config/ags/widgets/indicators/colorscheme.js b/.config/ags/widgets/indicators/colorscheme.js
index 3419e92b..54ecef8a 100644
--- a/.config/ags/widgets/indicators/colorscheme.js
+++ b/.config/ags/widgets/indicators/colorscheme.js
@@ -16,7 +16,7 @@ const ColorBox = ({
     ]
 })
 
-const colorschemeContent = Box({
+const ColorschemeContent = () => Box({
     className: 'osd-colorscheme spacing-v-5',
     vertical: true,
     hpack: 'center',
@@ -44,7 +44,7 @@ const colorschemeContent = Box({
 export default () => Widget.Revealer({
     transition: 'slide_down',
     transitionDuration: 200,
-    child: colorschemeContent,
+    child: ColorschemeContent(),
     setup: (self) => self.hook(showColorScheme, (revealer) => {
         revealer.revealChild = showColorScheme.value;
     }),
diff --git a/.config/ags/widgets/indicators/main.js b/.config/ags/widgets/indicators/main.js
index 69859476..db3fc4c8 100644
--- a/.config/ags/widgets/indicators/main.js
+++ b/.config/ags/widgets/indicators/main.js
@@ -1,7 +1,7 @@
 import Widget from 'resource:///com/github/Aylur/ags/widget.js';
 import Indicator from '../../services/indicator.js';
 import IndicatorValues from './indicatorvalues.js';
-// import MusicControls from './musiccontrols.js';
+import MusicControls from './musiccontrols.js';
 import ColorScheme from './colorscheme.js';
 import NotificationPopups from './notificationpopups.js';
 
@@ -23,7 +23,7 @@ export default (monitor = 0) => Widget.Window({
             css: 'min-height: 2px;',
             children: [
                 IndicatorValues(),
-                // MusicControls(),
+                MusicControls(),
                 NotificationPopups(),
                 ColorScheme(),
             ]
diff --git a/.config/ags/widgets/indicators/notificationpopups.js b/.config/ags/widgets/indicators/notificationpopups.js
index 7ca3e8ae..f5c0b367 100644
--- a/.config/ags/widgets/indicators/notificationpopups.js
+++ b/.config/ags/widgets/indicators/notificationpopups.js
@@ -4,37 +4,7 @@ import Notifications from 'resource:///com/github/Aylur/ags/service/notification
 const { Box } = Widget;
 import Notification from '../../lib/notification.js';
 
-const PopupNotification = (notifObject) => Widget.Box({
-    homogeneous: true,
-    children: [
-        Widget.EventBox({
-            onHoverLost: () => {
-                notifObject.dismiss();
-            },
-            child: Widget.Revealer({
-                revealChild: true,
-                child: Widget.Box({
-                    children: [Notification({
-                        notifObject: notifObject,
-                        isPopup: true,
-                        props: { hpack: 'fill' },
-                    })],
-                }),
-            })
-        })
-    ]
-})
-
-const naiveNotifPopupList = Widget.Box({
-    vertical: true,
-    className: 'spacing-v-5',
-    setup: (self) => self.hook(Notifications, (box) => {
-        box.children = Notifications.popups.reverse()
-            .map(notifItem => PopupNotification(notifItem));
-    }),
-})
-
-const notifPopupList = Box({
+export default () => Box({
     vertical: true,
     className: 'osd-notifs spacing-v-5-revealer',
     attribute: {
@@ -72,5 +42,3 @@ const notifPopupList = Box({
         .hook(Notifications, (box, id) => box.attribute.dismiss(box, id, true), 'closed')
     ,
 });
-
-export default () => notifPopupList;
\ No newline at end of file