From 48e02a4c8614d9296df5e8fb6df659b598f54cca Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Thu, 27 Jul 2023 23:07:22 -0400
Subject: [PATCH] feat(eww): add closer support for qs menu

---
 config/eww/quick-settings/quick-settings.yuck |  8 +++----
 config/eww/scripts/close.sh                   |  2 +-
 config/eww/scripts/open.sh                    |  1 +
 config/eww/scripts/qs-toggle.sh               | 23 +++++++++++++++++++
 config/eww/traybuttons/traybuttons.yuck       |  5 +---
 5 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100755 config/eww/scripts/qs-toggle.sh

diff --git a/config/eww/quick-settings/quick-settings.yuck b/config/eww/quick-settings/quick-settings.yuck
index 8cd8903..22cc3ff 100644
--- a/config/eww/quick-settings/quick-settings.yuck
+++ b/config/eww/quick-settings/quick-settings.yuck
@@ -6,7 +6,7 @@
     (label  :text "  ")
   )
 )
-(defwindow quick-settings-smol
+(defwindow quick-settings-smol-reveal
   :monitor 0
   :stacking "overlay"
   :exclusive "ignore"
@@ -26,7 +26,7 @@
 
 (defwidget quick-settings-logo []
   (eventbox :class "quick-settings-logo"
-            :onclick "eww close quick-settings-smol; eww close quick-settings-logo; eww close quick-settings; eww update showqs=false"
+            :onclick "$EWW_PATH/qs-toggle.sh off"
             :cursor "pointer"
 
     (box  :class "quick-settings-logo"
@@ -35,7 +35,7 @@
     )
   )
 )
-(defwindow quick-settings-logo
+(defwindow quick-settings-logo-reveal
   :monitor 0
   :stacking "overlay"
   :exclusive "ignore"
@@ -59,7 +59,7 @@
        :orientation "h"
   )
 )
-(defwindow quick-settings 
+(defwindow quick-settings-reveal
   :monitor 0
   :stacking "overlay"
   :geometry (geometry :x "5px"
diff --git a/config/eww/scripts/close.sh b/config/eww/scripts/close.sh
index 24f5049..66dd9c3 100755
--- a/config/eww/scripts/close.sh
+++ b/config/eww/scripts/close.sh
@@ -3,6 +3,6 @@
 WINDOW="$1"
 (
 eww update "$WINDOW"-visible=false
-sleep .55
+#sleep .55
 eww close "$WINDOW"-reveal
 ) &
diff --git a/config/eww/scripts/open.sh b/config/eww/scripts/open.sh
index 4b2605a..41c0f1e 100755
--- a/config/eww/scripts/open.sh
+++ b/config/eww/scripts/open.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+eww open closer &&
 
 WINDOW="$1"
 
diff --git a/config/eww/scripts/qs-toggle.sh b/config/eww/scripts/qs-toggle.sh
new file mode 100755
index 0000000..70574cb
--- /dev/null
+++ b/config/eww/scripts/qs-toggle.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+on () {
+  eww open closer &&
+
+  eww open quick-settings-reveal;
+  eww open quick-settings-smol-reveal;
+  eww open quick-settings-logo-reveal;
+  eww update showqs=true
+}
+
+off () {
+  (
+  eww update showqs=false
+  sleep .55
+  eww close quick-settings-reveal
+  eww close quick-settings-smol-reveal
+  eww close quick-settings-logo-reveal
+  )
+}
+
+[[ "$1" == "on" ]] && on
+[[ "$1" == "off" ]] && off
diff --git a/config/eww/traybuttons/traybuttons.yuck b/config/eww/traybuttons/traybuttons.yuck
index 55c1518..52f438b 100644
--- a/config/eww/traybuttons/traybuttons.yuck
+++ b/config/eww/traybuttons/traybuttons.yuck
@@ -161,10 +161,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defwidget quick-settings-toggle []
   (eventbox :class "toggle-off"
-            :onclick "eww open quick-settings;
-                      eww open quick-settings-smol;
-                      eww open quick-settings-logo;
-                      eww update showqs=true"
+            :onclick "$EWW_PATH/qs-toggle.sh on"
 
             :cursor "pointer"