From 4b7969f758f521771727e19bc357c4a249071226 Mon Sep 17 00:00:00 2001
From: James McKee <james@mck.is>
Date: Mon, 17 Jul 2023 16:05:15 +0100
Subject: [PATCH] Don't use seperate configuration for player controls when
 placed on top Also increase constrast of wave bar slightly

---
 Catppuccin/catppuccin-base.xml | 22 +---------------------
 scripts/build.sh               |  8 ++++----
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/Catppuccin/catppuccin-base.xml b/Catppuccin/catppuccin-base.xml
index c222e0215..67365c5f3 100644
--- a/Catppuccin/catppuccin-base.xml
+++ b/Catppuccin/catppuccin-base.xml
@@ -52,7 +52,7 @@
 		SpectrumOn="CatppuccinBlack1"
 
 		WaveBarOff="Accent"
-		WaveBarOn="CatppuccinBlack1"
+		WaveBarOn="CatppuccinBlack2"
 
 		StarRatingOn="CatppuccinForeground"
 		StarRatingOff="CatppuccinBlack2"
@@ -271,26 +271,6 @@
 		<element id="PlayerFlat.Wavebar.Inner" fg="WaveBarOn" fg2="WaveBarOff" />
 		<element id="PlayerFlat.MetroButton.Default" bg="CatppuccinBlack0" bdr="CatppuccinBlack0" />
 		<element id="PlayerFlat.MetroButton.Highlight" bg="CatppuccinBlack0" bdr="CatppuccinBlack0" />
-	\\ Flat Player (on Top)
-		<element id="PlayerTopFlat.Background" bg="Accent" bg2="Accent" fg="CatppuccinBlack0" bdr="Accent" />
-		<element id="PlayerTopFlat.DisplayPanel" bg="Accent" fg="CatppuccinBlack0" fg2="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.ProgressBar" bg="Accent" fg="CatppuccinBlack0" bdr="CatppuccinBlack0" /> <!-- fg is used for the fill colour -->
-		<element id="PlayerTopFlat.ProgressButton" fg="Highlight" />
-		<element id="PlayerTopFlat.Control.Default" fg="CatppuccinForeground" />
-		<element id="PlayerTopFlat.Control.Disabled" fg="CatppuccinGray0" />
-		<element id="PlayerTopFlat.Control.Highlight" fg="Highlight" />
-		<element id="PlayerTopFlat.StarRating.Default" fg="StarRatingOn" />
-		<element id="PlayerTopFlat.StarRating.Lowlight" fg="StarRatingOff" />
-		<element id="PlayerTopFlat.NotLovedIcon" fg="CatppuccinBlack4" />
-		<element id="PlayerTopFlat.SpectrumDefault" bg="Accent" />
-		<element id="PlayerTopFlat.SpectrumDead" bg="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.SpectrumLow" bg="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.SpectrumMedium" bg="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.SpectrumHigh" bg="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.Wavebar" fg="CatppuccinBlack0" fg2="Accent" />
-		<element id="PlayerTopFlat.Wavebar.Inner" fg="CatppuccinBlack0" fg2="Accent" />
-		<element id="PlayerTopFlat.MetroButton.Default" bg="CatppuccinBlack0" bdr="CatppuccinBlack0" />
-		<element id="PlayerTopFlat.MetroButton.Highlight" bg="CatppuccinBlack0" bdr="CatppuccinBlack0" />
 
 	\\ SideBar Player
 		<element id="PlayerSidebar.Background" bg="PanelBG" fg="CatppuccinForeground" />
diff --git a/scripts/build.sh b/scripts/build.sh
index 54a3ef26c..70a14f3a5 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -217,8 +217,8 @@ for theme_index in "${!theme_names[@]}"; do
                 sed -i "s/\\\\\\\\ Bar text placeholder/MainPlayerText=\"CatppuccinForeground\"/g" ./catppuccin-base.xml
                 sed -i "s/SpectrumOff=\"Accent\"/SpectrumOff=\"CatppuccinBlack1\"/g"            ./catppuccin-base.xml
                 sed -i "s/SpectrumOn=\"CatppuccinBlack1\"/SpectrumOn=\"Accent\"/g"              ./catppuccin-base.xml
-                sed -i "s/WaveBarOn=\"CatppuccinBlack1\"/WaveBarOn=\"Accent\"/g"                ./catppuccin-base.xml
-                sed -i "s/WaveBarOff=\"Accent\"/WaveBarOff=\"CatppuccinBlack1\"/g"              ./catppuccin-base.xml
+                sed -i "s/WaveBarOn=\"CatppuccinBlack2\"/WaveBarOn=\"Accent\"/g"                ./catppuccin-base.xml
+                sed -i "s/WaveBarOff=\"Accent\"/WaveBarOff=\"CatppuccinBlack2\"/g"              ./catppuccin-base.xml
                 sed -i "s/StarRatingOn=\"CatppuccinForeground\"/StarRatingOn=\"Accent\"/g"      ./catppuccin-base.xml
             else
                 bar_state_underscored="bar_accented"
@@ -264,8 +264,8 @@ for theme_index in "${!theme_names[@]}"; do
                 sed -i "s/MainPlayerText=\"CatppuccinForeground\"/\\\\\\\\ Bar text placeholder/g" ./catppuccin-base.xml
                 sed -i "s/SpectrumOn=\"Accent\"/SpectrumOn=\"CatppuccinBlack1\"/g"              ./catppuccin-base.xml
                 sed -i "s/SpectrumOff=\"CatppuccinBlack1\"/SpectrumOff=\"Accent\"/g"            ./catppuccin-base.xml
-                sed -i "s/WaveBarOff=\"CatppuccinBlack1\"/WaveBarOff=\"Accent\"/g"              ./catppuccin-base.xml
-                sed -i "s/WaveBarOn=\"Accent\"/WaveBarOn=\"CatppuccinBlack1\"/g"                ./catppuccin-base.xml
+                sed -i "s/WaveBarOff=\"CatppuccinBlack2\"/WaveBarOff=\"Accent\"/g"              ./catppuccin-base.xml
+                sed -i "s/WaveBarOn=\"Accent\"/WaveBarOn=\"CatppuccinBlack2\"/g"                ./catppuccin-base.xml
                 sed -i "s/StarRatingOn=\"Accent\"/StarRatingOn=\"CatppuccinForeground\"/g"      ./catppuccin-base.xml
             else
                 sed -i "s/accent-bar-${palette_names[$colour_index]}/accent-bar-placeholder/g"  ./skin_wavebar.xml ./skin.xml ./skin.bak