From 9b342341fe17e4fb2c4cad9e3379a814a6a73097 Mon Sep 17 00:00:00 2001
From: Jas Singh <jaskiratpal.singh@outlook.com>
Date: Sun, 16 Feb 2025 21:41:52 -0800
Subject: [PATCH] Added shadows to the Bar, Menus, OSD and Notifications.
 (#777)

* Added shadows to the Bar, Menus and notifications.

* Add OSD shadows
---
 src/components/menus/shared/dropdown/index.tsx     |  4 ++--
 src/components/settings/pages/config/bar/index.tsx | 14 +++++++++++++-
 .../settings/pages/config/general/index.tsx        | 12 ++++++++++++
 .../settings/pages/config/notifications/index.tsx  | 11 +++++++++++
 src/components/settings/pages/config/osd/index.tsx |  7 +++++++
 src/options.ts                                     |  9 ++++++++-
 src/scss/style/bar/bar.scss                        |  3 +++
 src/scss/style/menus/calendar.scss                 |  1 -
 src/scss/style/menus/dashboard.scss                |  1 -
 src/scss/style/menus/menu.scss                     |  6 ++++++
 src/scss/style/menus/notifications.scss            |  1 -
 src/scss/style/notifications/popups.scss           |  2 ++
 src/scss/style/osd/index.scss                      |  2 ++
 13 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/src/components/menus/shared/dropdown/index.tsx b/src/components/menus/shared/dropdown/index.tsx
index 27975fe..5c037c4 100644
--- a/src/components/menus/shared/dropdown/index.tsx
+++ b/src/components/menus/shared/dropdown/index.tsx
@@ -3,7 +3,7 @@ import { DropdownMenuProps } from 'src/lib/types/dropdownmenu';
 import { BarEventMargins } from './eventBoxes/index';
 import { globalEventBoxes } from 'src/globals/dropdown';
 import { bind } from 'astal';
-import { App, Astal, Gdk } from 'astal/gtk3';
+import { App, Astal, Gdk, Gtk } from 'astal/gtk3';
 import { Revealer } from 'astal/gtk3/widget';
 import { locationMap } from 'src/lib/types/defaults/bar';
 
@@ -88,7 +88,7 @@ export default ({
                                 transitionType={transition}
                                 transitionDuration={bind(options.menus.transitionTime)}
                             >
-                                <box className="dropdown-menu-container" canFocus>
+                                <box className="dropdown-content" halign={Gtk.Align.CENTER} expand canFocus>
                                     {child}
                                 </box>
                             </revealer>
diff --git a/src/components/settings/pages/config/bar/index.tsx b/src/components/settings/pages/config/bar/index.tsx
index b9300ee..10f7dc2 100644
--- a/src/components/settings/pages/config/bar/index.tsx
+++ b/src/components/settings/pages/config/bar/index.tsx
@@ -1,7 +1,7 @@
-import { Option } from 'src/components/settings/shared/Option';
 import { Header } from 'src/components/settings/shared/Header';
 import options from 'src/options';
 import { Gtk } from 'astal/gtk3';
+import { Option } from 'src/components/settings/shared/Option';
 
 export const BarSettings = (): JSX.Element => {
     return (
@@ -53,6 +53,18 @@ export const BarSettings = (): JSX.Element => {
                     enums={['none', 'full', 'top', 'right', 'bottom', 'left', 'horizontal', 'vertical']}
                 />
                 <Option opt={options.theme.bar.border.width} title="Bar Border Width" type="string" />
+                <Option
+                    opt={options.theme.bar.shadow}
+                    title="Bar Shadow"
+                    subtitle="Requires that sufficient margins have been set to house the shadow."
+                    type="string"
+                />
+                <Option
+                    opt={options.theme.bar.shadowMargins}
+                    title="Bar Shadow Margins"
+                    subtitle="Margins count mouse events as clicks 'inside' the menu."
+                    type="string"
+                />
                 <Option
                     opt={options.theme.bar.border_radius}
                     title="Border Radius"
diff --git a/src/components/settings/pages/config/general/index.tsx b/src/components/settings/pages/config/general/index.tsx
index adcd447..c5fe2ba 100644
--- a/src/components/settings/pages/config/general/index.tsx
+++ b/src/components/settings/pages/config/general/index.tsx
@@ -65,6 +65,18 @@ export const BarGeneral = (): JSX.Element => {
                     max={10000}
                     increment={25}
                 />
+                <Option
+                    opt={options.theme.bar.menus.shadow}
+                    title="Menu Shadow"
+                    subtitle="Requires that sufficient margins have been set to house the shadow."
+                    type="string"
+                />
+                <Option
+                    opt={options.theme.bar.menus.shadowMargins}
+                    title="Menu Shadow Margins"
+                    subtitle="Margins count mouse events as clicks 'inside' the menu."
+                    type="string"
+                />
 
                 <Header title="Scaling" />
                 <Option
diff --git a/src/components/settings/pages/config/notifications/index.tsx b/src/components/settings/pages/config/notifications/index.tsx
index 720463f..e98e8fe 100644
--- a/src/components/settings/pages/config/notifications/index.tsx
+++ b/src/components/settings/pages/config/notifications/index.tsx
@@ -22,6 +22,17 @@ export const NotificationSettings = (): JSX.Element => {
                     enums={['top left', 'top', 'top right', 'right', 'bottom right', 'bottom', 'bottom left', 'left']}
                 />
                 <Option opt={options.theme.notification.border_radius} title="Border Radius" type="string" />
+                <Option
+                    opt={options.theme.notification.shadow}
+                    title="Notification Shadow"
+                    subtitle="Requires that sufficient margins have been set to house the shadow."
+                    type="string"
+                />
+                <Option
+                    opt={options.theme.notification.shadowMargins}
+                    title="Notification Shadow Margins"
+                    type="string"
+                />
                 <Option
                     opt={options.notifications.monitor}
                     title="Monitor"
diff --git a/src/components/settings/pages/config/osd/index.tsx b/src/components/settings/pages/config/osd/index.tsx
index 2592d68..a835eb7 100644
--- a/src/components/settings/pages/config/osd/index.tsx
+++ b/src/components/settings/pages/config/osd/index.tsx
@@ -48,6 +48,13 @@ export const OSDSettings = (): JSX.Element => {
                     subtitle="Format: top right bottom left"
                     type="string"
                 />
+
+                <Option
+                    opt={options.theme.osd.shadow}
+                    title="OSD Shadow"
+                    subtitle="Requires that sufficient margins have been set to house the shadow."
+                    type="string"
+                />
                 <Option opt={options.theme.osd.border.size} title="Border Size" type="string" />
                 <Option opt={options.theme.osd.radius} title="Radius" subtitle="Radius of the OSD" type="string" />
                 <Option
diff --git a/src/options.ts b/src/options.ts
index 1b72ef8..7f4076e 100644
--- a/src/options.ts
+++ b/src/options.ts
@@ -120,6 +120,8 @@ const options = mkOptions(CONFIG, {
             label: opt(colors.lavender),
             border: opt(secondary_colors.surface0),
             border_radius: opt('0.6em'),
+            shadow: opt('0px 1px 2px 1px #16161e'),
+            shadowMargins: opt('4px 4px'),
             time: opt(secondary_colors.overlay1),
             text: opt(colors.text),
             labelicon: opt(colors.lavender),
@@ -148,7 +150,8 @@ const options = mkOptions(CONFIG, {
             monitor: opt(0),
             active_monitor: opt(true),
             radius: opt('0.4em'),
-            margins: opt('0px 5px 0px 0px'),
+            margins: opt('7px 7px 7px 7px'),
+            shadow: opt('0px 0px 3px 2px #16161e'),
             location: opt<OSDAnchor>('right'),
             muted_zero: opt(false),
         },
@@ -159,6 +162,8 @@ const options = mkOptions(CONFIG, {
             layer: opt<WindowLayer>('top'),
             margin_top: opt('0.5em'),
             opacity: opt(100),
+            shadow: opt('0px 1px 2px 1px #16161e'),
+            shadowMargins: opt('0px 0px 4px 0px'),
             margin_bottom: opt('0em'),
             margin_sides: opt('0.5em'),
             border_radius: opt('0.4em'),
@@ -431,6 +436,8 @@ const options = mkOptions(CONFIG, {
                     radius: opt('0.7em'),
                     color: opt(colors.surface0),
                 },
+                shadow: opt('0px 0px 3px 1px #16161e'),
+                shadowMargins: opt('5px 5px'),
                 text: opt(colors.text),
                 dimtext: opt(colors.surface2),
                 feinttext: opt(colors.surface0),
diff --git a/src/scss/style/bar/bar.scss b/src/scss/style/bar/bar.scss
index 397efc7..c5637cf 100644
--- a/src/scss/style/bar/bar.scss
+++ b/src/scss/style/bar/bar.scss
@@ -16,6 +16,9 @@
         background: if($bar-transparent, transparent, transparentize($bar-background, $transparency-value));
         border-radius: if($bar-floating, $bar-border_radius, 0em);
 
+        margin: $bar-shadowMargins;
+        box-shadow: $bar-shadow;
+
         &.withBorder {
             border-top: if(
                 $bar-border_location == 'top' or $bar-border_location == 'horizontal' or $bar-border_location == 'full',
diff --git a/src/scss/style/menus/calendar.scss b/src/scss/style/menus/calendar.scss
index ed5aff8..f820dcd 100644
--- a/src/scss/style/menus/calendar.scss
+++ b/src/scss/style/menus/calendar.scss
@@ -10,7 +10,6 @@
     border: $bar-menus-border-size solid
         if($bar-menus-monochrome, $bar-menus-border-color, $bar-menus-menu-clock-border-color);
     border-radius: $bar-menus-border-radius;
-    margin-right: 0.5em;
     opacity: $bar-menus-opacity * 0.01;
 }
 
diff --git a/src/scss/style/menus/dashboard.scss b/src/scss/style/menus/dashboard.scss
index fb884f5..650cc18 100644
--- a/src/scss/style/menus/dashboard.scss
+++ b/src/scss/style/menus/dashboard.scss
@@ -3,7 +3,6 @@
 }
 
 .dashboard-content-items {
-    margin-left: 0.5em;
     min-width: 28.5em;
     background: if($bar-menus-monochrome, $bar-menus-background, $bar-menus-menu-dashboard-background-color);
     border: $bar-menus-border-size solid
diff --git a/src/scss/style/menus/menu.scss b/src/scss/style/menus/menu.scss
index 1c8bd07..09c858e 100644
--- a/src/scss/style/menus/menu.scss
+++ b/src/scss/style/menus/menu.scss
@@ -226,6 +226,12 @@
     min-height: 10em;
 }
 
+.dropdown-content {
+    border-radius: $bar-menus-border-radius;
+    margin: $bar-menus-shadowMargins;
+    box-shadow: $bar-menus-shadow;
+}
+
 .menu-label {
     margin: 0.5em 1em;
     color: $sky;
diff --git a/src/scss/style/menus/notifications.scss b/src/scss/style/menus/notifications.scss
index 2bce71e..61ba575 100644
--- a/src/scss/style/menus/notifications.scss
+++ b/src/scss/style/menus/notifications.scss
@@ -10,7 +10,6 @@
     border: $bar-menus-border-size solid
         if($bar-menus-monochrome, $bar-menus-border-color, $bar-menus-menu-notifications-border);
     border-radius: $bar-menus-border-radius;
-    margin-right: 0.45em;
     opacity: $bar-menus-opacity * 0.01;
 
     .window-content.notificationsmenu-window {
diff --git a/src/scss/style/notifications/popups.scss b/src/scss/style/notifications/popups.scss
index b5ff837..f2008bc 100644
--- a/src/scss/style/notifications/popups.scss
+++ b/src/scss/style/notifications/popups.scss
@@ -7,6 +7,8 @@
     min-height: 4em;
     border-radius: $notification-border_radius;
     opacity: $notification-opacity * 0.01;
+    margin: $notification-shadowMargins;
+    box-shadow: $notification-shadow;
 }
 
 .notification-card-container {
diff --git a/src/scss/style/osd/index.scss b/src/scss/style/osd/index.scss
index 3911c69..b8676a9 100644
--- a/src/scss/style/osd/index.scss
+++ b/src/scss/style/osd/index.scss
@@ -6,6 +6,8 @@
     .osd-container {
         margin: $osd-margins;
         opacity: $osd-opacity * 0.01;
+        box-shadow: $osd-shadow;
+        border-radius: $osd-radius;
     }
 
     .osd-label-container {