From 08eef602c268c7f708bed259f13ed79afc9d8b53 Mon Sep 17 00:00:00 2001
From: Rory Fewell <roryf@oddmatics.uk>
Date: Tue, 18 Apr 2023 00:00:04 +0100
Subject: [PATCH] Prelim: Some more Start menu style fixes

---
 .../override/xp-start-plugin.scss             | 23 +++++++++++
 .../luna/blue/gtk-3.0/styling/start-menu.scss | 38 +++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/themes/gtk-3.0-base/override/xp-start-plugin.scss b/themes/gtk-3.0-base/override/xp-start-plugin.scss
index f6f14e4..9928cbb 100644
--- a/themes/gtk-3.0-base/override/xp-start-plugin.scss
+++ b/themes/gtk-3.0-base/override/xp-start-plugin.scss
@@ -221,12 +221,35 @@ window.csd.xp-start-menu // Specificity hack -_-
         {
             @include __wintc_apply_props($start_menu_popup_menu_styles);
 
+            $l_border_bottom:
+                __wintc_get_prop_with_fallbacks(
+                    "border-bottom-width",
+                    $start_menu_popup_menu_styles,
+                    $popup_menu_styles
+                );
+            $l_border_top:
+                __wintc_get_prop_with_fallbacks(
+                    "border-top-width",
+                    $start_menu_popup_menu_styles,
+                    $popup_menu_styles
+                );
+
             menuitem
             {
                 @include __wintc_apply_props(
                     $start_menu_popup_menu_menuitem_styles
                 );
 
+                &:first-child
+                {
+                    margin-top: $l_border_top;
+                }
+
+                &:last-child
+                {
+                    margin-bottom: $l_border_bottom;
+                }
+
                 image
                 {
                     @include __wintc_apply_props(
diff --git a/themes/luna/blue/gtk-3.0/styling/start-menu.scss b/themes/luna/blue/gtk-3.0/styling/start-menu.scss
index cf929a1..0a53053 100644
--- a/themes/luna/blue/gtk-3.0/styling/start-menu.scss
+++ b/themes/luna/blue/gtk-3.0/styling/start-menu.scss
@@ -386,6 +386,44 @@ $start_menu_allprograms_menuitem_styles:
     );
 
 
+//
+// START MENU POPUP MENU
+//
+$start_menu_popup_menu_styles:
+    wintc_define_props_borders(
+        $start_menu_popup_menu_styles,
+        false,
+        solid,
+        1,
+        1,
+        1,
+        6,
+        undefined,
+        url('../Resources/start_menu_item.png')
+    );
+
+$start_menu_popup_menu_menuitem_styles:
+    wintc_define_props_box(
+        $start_menu_popup_menu_menuitem_styles,
+        false,
+        margin,
+        0,
+        1,
+        0,
+        6
+    );
+$start_menu_popup_menu_menuitem_styles:
+    wintc_define_props_box(
+        $start_menu_popup_menu_menuitem_styles,
+        false,
+        padding,
+        3,
+        0,
+        2,
+        12
+    );
+
+
 //
 // START MENU PLACES COLUMN
 //