From 877c254740e8d1ee7e1e04adad90631b617f1ead Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Tue, 11 Mar 2025 15:55:32 +1100
Subject: notifs: make dnd actually work

Also change bar icon and hide count when dnd
---
 scss/bar.scss               |  5 -----
 src/modules/bar.tsx         | 15 +++++++++++++--
 src/modules/notifpopups.tsx |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/scss/bar.scss b/scss/bar.scss
index 8d1d67f..33ba0cf 100644
--- a/scss/bar.scss
+++ b/scss/bar.scss
@@ -183,11 +183,6 @@
 
         .status-icons .bluetooth {
             @include lib.spacing(10, true);
-
-            // The spacing doesn't look right for some reason so this
-            & > :first-child:not(:last-child) {
-                margin-bottom: lib.s(5);
-            }
         }
     }
 }
diff --git a/src/modules/bar.tsx b/src/modules/bar.tsx
index c2695c4..85d2add 100644
--- a/src/modules/bar.tsx
+++ b/src/modules/bar.tsx
@@ -459,8 +459,19 @@ const NotifCount = () => (
         }
     >
         <box vertical={bind(config.vertical)} className="module notif-count">
-            <label className="icon" label="info" />
-            <label label={bind(AstalNotifd.get_default(), "notifications").as(n => String(n.length))} />
+            <label
+                className="icon"
+                label={bind(AstalNotifd.get_default(), "dontDisturb").as(d => (d ? "notifications_off" : "info"))}
+            />
+            <revealer
+                transitionType={bind(config.vertical).as(v =>
+                    v ? Gtk.RevealerTransitionType.SLIDE_DOWN : Gtk.RevealerTransitionType.SLIDE_RIGHT
+                )}
+                transitionDuration={120}
+                revealChild={bind(AstalNotifd.get_default(), "dontDisturb").as(d => !d)}
+            >
+                <label label={bind(AstalNotifd.get_default(), "notifications").as(n => String(n.length))} />
+            </revealer>
         </box>
     </button>
 );
diff --git a/src/modules/notifpopups.tsx b/src/modules/notifpopups.tsx
index 0332fa7..d3cbb90 100644
--- a/src/modules/notifpopups.tsx
+++ b/src/modules/notifpopups.tsx
@@ -19,7 +19,7 @@ export default () => (
                 let notifsOpen = false;
 
                 self.hook(notifd, "notified", (self, id) => {
-                    if (notifsOpen) return;
+                    if (notifsOpen || notifd.dontDisturb) return;
 
                     const notification = notifd.get_notification(id);
 
-- 
cgit v1.2.3-freya