From 66ab6e1eba5639d624ac045ff4016054717ce407 Mon Sep 17 00:00:00 2001
From: Rory Fewell <roryf@oddmatics.uk>
Date: Tue, 18 Apr 2023 20:05:09 +0100
Subject: [PATCH] Prelim: Proper fix for Start menu menus

---
 .../override/xp-start-plugin.scss             | 28 ++++++-------------
 themes/gtk-3.0-base/styling/start-menu.scss   |  2 +-
 .../luna/blue/gtk-3.0/styling/start-menu.scss |  2 +-
 3 files changed, 11 insertions(+), 21 deletions(-)

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 9928cbb..f771a7f 100644
--- a/themes/gtk-3.0-base/override/xp-start-plugin.scss
+++ b/themes/gtk-3.0-base/override/xp-start-plugin.scss
@@ -221,33 +221,23 @@ 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
+                @if $start_menu_popup_menu_vmargin != "novalue"
                 {
-                    margin-top: $l_border_top;
-                }
+                    &:first-child
+                    {
+                        margin-top: $start_menu_popup_menu_vmargin;
+                    }
 
-                &:last-child
-                {
-                    margin-bottom: $l_border_bottom;
+                    &:last-child
+                    {
+                        margin-bottom: $start_menu_popup_menu_vmargin;
+                    }
                 }
 
                 image
diff --git a/themes/gtk-3.0-base/styling/start-menu.scss b/themes/gtk-3.0-base/styling/start-menu.scss
index 6b3a053..67fb348 100644
--- a/themes/gtk-3.0-base/styling/start-menu.scss
+++ b/themes/gtk-3.0-base/styling/start-menu.scss
@@ -18,7 +18,7 @@ $start_menu_display_userpic: false !default;
 $start_menu_programs_column_width: 182px !default;
 $start_menu_places_column_width: 178px !default;
 
-$start_menu_popup_menu_vmargin: 0px !default;
+$start_menu_popup_menu_vmargin: novalue !default;
 
 $start_menu_separator_thickness: $separator_thickness !default;
 
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 0a53053..0ede8e3 100644
--- a/themes/luna/blue/gtk-3.0/styling/start-menu.scss
+++ b/themes/luna/blue/gtk-3.0/styling/start-menu.scss
@@ -18,7 +18,7 @@ $start_menu_display_userpic: true;
 $start_menu_programs_column_width: 176px;
 $start_menu_places_column_width: 176px;
 
-$start_menu_popup_menu_vmargin: 0px;
+$start_menu_popup_menu_vmargin: 1px;
 
 $start_menu_separator_thickness: $separator_thickness;