From 20b544918d992a0b042d3180ab451660b6845693 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sun, 12 May 2019 02:13:47 +0100
Subject: [PATCH] Tweak grub menu theming

Add a png to use as highlighting for the selected menu item, and play
with colours a little
---
 data/buster/grub-theme.in  |  25 +++++++++++++------------
 data/buster/hl_c.png       | Bin 0 -> 267 bytes
 tools/boot/buster/boot-x86 |   1 +
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 data/buster/hl_c.png

diff --git a/data/buster/grub-theme.in b/data/buster/grub-theme.in
index bf71b067..3cb9db6f 100644
--- a/data/buster/grub-theme.in
+++ b/data/buster/grub-theme.in
@@ -15,35 +15,35 @@ terminal-font: "Sans Regular 12"
 #ifdef MENU0
   + hbox {
     left = 0
-    + label {text = MENU0 font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = MENU0 font = "Sans 10" color = "#c0c0c0" align = "left"}
   }
 #endif
 #ifdef MENU1
   + hbox {
     left = 0
     + label {text = " >" font = "Sans 10" color = "white" align = "left"}
-    + label {text = MENU1 font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = MENU1 font = "Sans 10" color = "#c0c0c0" align = "left"}
   }
 #endif
 #ifdef MENU2
   + hbox {
     left = 0
     + label {text = "   >" font = "Sans 10" color = "white" align = "left"}
-    + label {text = MENU2 font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = MENU2 font = "Sans 10" color = "#c0c0c0" align = "left"}
   }
 #endif
 #ifdef MENU3
   + hbox {
     left = 0
     + label {text = "     >" font = "Sans 10" color = "white" align = "left"}
-    + label {text = MENU3 font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = MENU3 font = "Sans 10" color = "#c0c0c0" align = "left"}
   }
 #endif
 #ifdef MENU4
   + hbox {
     left = 0
     + label {text = "       >" font = "Sans 10" color = "white" align = "left"}
-    + label {text = MENU4 font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = MENU4 font = "Sans 10" color = "#c0c0c0" align = "left"}
   }
 #endif
 }
@@ -54,11 +54,12 @@ terminal-font: "Sans Regular 12"
   top = 200
   height = 200
   item_font = "Sans Regular 12"
-  item_color = #d3d3d3
-  selected_item_color = "white"
+  item_color = #c0c0c0
+  selected_item_color = "black"
+  selected_item_pixmap_style = "hl_*.png"
   item_height = 20
   item_padding = 15
-  item_spacing = 5
+  item_spacing = 10
 }
 
 + vbox {
@@ -68,20 +69,20 @@ terminal-font: "Sans Regular 12"
     top = 0
     left = 20%
     + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
-    + label {text = "Select             " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "Select             " font = "Sans 10" color = "#c0c0c0" align = "left"}
 #ifdef MENU1
     + label {text = "           " font = "Sans 10" color = "white" align = "left"}
     + label {text = "Esc:   " font = "Sans 10" color = "white" align = "left"}
-    + label {text = "Back up one level  " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "Back up one level  " font = "Sans 10" color = "#c0c0c0" align = "left"}
 #endif
   }
   + hbox {
     top = 0
     left = 20%
     + label {text = "E:     " font = "Sans 10" color = "white" align = "left"}
-    + label {text = "Edit Selection     " font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "Edit Selection     " font = "Sans 10" color = "#c0c0c0" align = "left"}
     + label {text = "           " font = "Sans 10" color = "white" align = "left"}
     + label {text = "C:     " font = "Sans 10" color = "white" align = "left"}
-    + label {text = "GRUB Command line" font = "Sans 10" color = "#d3d3d3" align = "left"}
+    + label {text = "GRUB Command line" font = "Sans 10" color = "#c0c0c0" align = "left"}
   }  
 }
diff --git a/data/buster/hl_c.png b/data/buster/hl_c.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e9602bf9c2faf85eb17a352f6249e7c3ba47b4
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^A|T8GBp6maa=HklSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{Xiaj
ziKnkC`(sufCJWO!v*JGig@ip_977~7C)*ro;G7}h#>zfXfg$EF!;6<Y){6tBRZCnW
zN>UO_QmvAUQh^kMk%6J5u7Rnpp;3r|p_Qqbm8r2dkYQlZ^_8O&MMG|WN@iLmZVkUz
SY%m3CVDNPHb6Mw<&;$TYRz@KJ

literal 0
HcmV?d00001

diff --git a/tools/boot/buster/boot-x86 b/tools/boot/buster/boot-x86
index 4d8f2e06..15c5961a 100644
--- a/tools/boot/buster/boot-x86
+++ b/tools/boot/buster/boot-x86
@@ -475,6 +475,7 @@ if [ -d boot$N/isolinux/grub ] && [ $BOOT_EFI -ne 0 ] ; then
     $BASEDIR/tools/boot/$DI_CODENAME/parse_isolinux \
         boot$N/isolinux $CDDIR $BASEDIR/data/$DI_CODENAME/grub-theme.in "$DISKINFO_DISTRO" "$DEBIAN_KERNEL" "$DEBVERSION" \
         >> $CDDIR/boot/grub/grub.cfg
+    cp -v $BASEDIR/data/$DI_CODENAME/hl*png $CDDIR/boot/grub/theme
     NUM_ENTRIES=$(grep menuentry $CDDIR/boot/grub/grub.cfg | wc -l)
     echo "    CD$N/boot/grub/grub.cfg has $NUM_ENTRIES boot entries defined"