From e4d53629ed4113714264dc793c5d64c428e118de Mon Sep 17 00:00:00 2001
From: jean-emmanuel <jean-emmanuel.doucet@groolot.net>
Date: Wed, 13 Dec 2023 18:45:38 +0100
Subject: [PATCH] ui: meter: use sementically correct color name for meter
 outline

---
 gtk2_ardour/themes/blueberry_milk-ardour.colors | 1 +
 gtk2_ardour/themes/caineville-ardour.colors     | 1 +
 gtk2_ardour/themes/clear_gray-ardour.colors     | 1 +
 gtk2_ardour/themes/cubasish-ardour.colors       | 1 +
 gtk2_ardour/themes/dark-ardour.colors           | 1 +
 gtk2_ardour/themes/diehard3-ardour.colors       | 1 +
 gtk2_ardour/themes/recbox-ardour.colors         | 1 +
 gtk2_ardour/themes/unastudia-ardour.colors      | 1 +
 gtk2_ardour/themes/xcolors-ardour.colors        | 1 +
 libs/widgets/fastmeter.cc                       | 2 +-
 10 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index bad14e9d4c..8a6199dea0 100644
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -200,6 +200,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 874b3985bf..f55bed1757 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -201,6 +201,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index 0fd36e6eeb..55d692225b 100644
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -201,6 +201,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index b85fd0f8a1..1f3d5bf4cc 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -201,6 +201,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 9feec630de..9c6e26fe1f 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -203,6 +203,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/diehard3-ardour.colors b/gtk2_ardour/themes/diehard3-ardour.colors
index 1c3415a441..9289285964 100644
--- a/gtk2_ardour/themes/diehard3-ardour.colors
+++ b/gtk2_ardour/themes/diehard3-ardour.colors
@@ -202,6 +202,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:backgroundest"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/recbox-ardour.colors b/gtk2_ardour/themes/recbox-ardour.colors
index 2f9855934d..2f28c155b9 100644
--- a/gtk2_ardour/themes/recbox-ardour.colors
+++ b/gtk2_ardour/themes/recbox-ardour.colors
@@ -202,6 +202,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:background"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index c667fbe93a..48b47b947c 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -200,6 +200,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="neutral:background"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/gtk2_ardour/themes/xcolors-ardour.colors b/gtk2_ardour/themes/xcolors-ardour.colors
index 8e1c3e4761..b7a75eee09 100644
--- a/gtk2_ardour/themes/xcolors-ardour.colors
+++ b/gtk2_ardour/themes/xcolors-ardour.colors
@@ -201,6 +201,7 @@
     <ColorAlias name="meter color BBC" alias="alert:orange"/>
     <ColorAlias name="meter marker" alias="widget:orange"/>
     <ColorAlias name="meter marker music" alias="widget:orange"/>
+    <ColorAlias name="meter outline" alias="theme:bg2"/>
     <ColorAlias name="meterbridge label: fill" alias="theme:bg"/>
     <ColorAlias name="meterbridge label: fill active" alias="neutral:background2"/>
     <ColorAlias name="meterbridge label: led" alias="alert:red"/>
diff --git a/libs/widgets/fastmeter.cc b/libs/widgets/fastmeter.cc
index 448e5cada8..10f695fa94 100644
--- a/libs/widgets/fastmeter.cc
+++ b/libs/widgets/fastmeter.cc
@@ -130,7 +130,7 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o, int len,
 	request_width = pixrect.width + 2;
 	request_height= pixrect.height + 2;
 
-	outline_color = UIConfigurationBase::instance().color ("generic button: outline");
+	outline_color = UIConfigurationBase::instance().color ("meter outline");
 
 	clear ();
 }