From 92f8d1e577b5a6f94f708ca758af5a0831222fba Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 11 Oct 2022 21:58:40 +0200
Subject: [PATCH] Further reduce differences in themes (sort and indent
 modifiers)

---
 gtk2_ardour/themes/blueberry_milk-ardour.colors | 2 +-
 gtk2_ardour/themes/caineville-ardour.colors     | 2 +-
 gtk2_ardour/themes/clear_gray-ardour.colors     | 2 +-
 gtk2_ardour/themes/cubasish-ardour.colors       | 2 +-
 gtk2_ardour/themes/recbox-ardour.colors         | 5 +++--
 gtk2_ardour/themes/unastudia-ardour.colors      | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index a0ce52905b..702ff518de 100644
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -509,7 +509,7 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.7"/>
     <Modifier name="transparent region base" modifier="= alpha:0.6"/>
-   <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.4666"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 72584f4c82..0f79adb08b 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -510,7 +510,7 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.7"/>
     <Modifier name="transparent region base" modifier="= alpha:0.6"/>
-   <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.4666"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>
diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index 6a99114be8..437e64580e 100644
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -510,7 +510,7 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.7"/>
     <Modifier name="transparent region base" modifier="= alpha:0.6"/>
-   <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.8"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 947ce671f1..0644f99ba3 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -510,7 +510,7 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.7"/>
     <Modifier name="transparent region base" modifier="= alpha:0.6"/>
-   <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.4666"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>
diff --git a/gtk2_ardour/themes/recbox-ardour.colors b/gtk2_ardour/themes/recbox-ardour.colors
index 7464155720..84120b8cf3 100644
--- a/gtk2_ardour/themes/recbox-ardour.colors
+++ b/gtk2_ardour/themes/recbox-ardour.colors
@@ -421,6 +421,7 @@
     <ColorAlias name="stretch clock: edited text" alias="theme:contrasting alt"/>
     <ColorAlias name="stretch clock: text" alias="theme:contrasting clock"/>
     <ColorAlias name="sync mark" alias="theme:contrasting clock"/>
+    <ColorAlias name="region mark" alias="theme:contrasting alt"/>
     <ColorAlias name="tempo bar" alias="neutral:background2"/>
     <ColorAlias name="tempo curve" alias="widget:blue"/>
     <ColorAlias name="tempo marker" alias="widget:orange"/>
@@ -486,10 +487,10 @@
     <Modifier name="gain line inactive" modifier="= alpha:0.77249999999999996"/>
     <Modifier name="ghost track base" modifier="= alpha:0.64078199999999996"/>
     <Modifier name="ghost track midi fill" modifier="= alpha:0.29999999999999999"/>
-    <Modifier name="grid line" modifier="= alpha:1"/>
     <Modifier name="inactive crossfade" modifier="= alpha:0.46660000000000001"/>
     <Modifier name="loop rectangle" modifier="= alpha:0.5"/>
     <Modifier name="marker bar" modifier="= alpha:0.5"/>
+    <Modifier name="grid line" modifier="= alpha:1"/>
     <Modifier name="midi frame base" modifier="= alpha:0.40000000000000002"/>
     <Modifier name="midi note" modifier="= alpha:0.80000000000000004"/>
     <Modifier name="midi note velocity text" modifier="= alpha:0.46660000000000001"/>
@@ -508,8 +509,8 @@
     <Modifier name="stereo panner inverted" modifier="= alpha:0.78820000000000001"/>
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.75290000000000001"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.69999999999999996"/>
-    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="transparent region base" modifier="= alpha:0.59999999999999998"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.46660000000000001"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 90168d4e79..c3876de968 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -509,7 +509,7 @@
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="time axis view item base" modifier="= alpha:0.7"/>
     <Modifier name="transparent region base" modifier="= alpha:0.6"/>
-   <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
+    <Modifier name="time stretch fill" modifier="= alpha:0.5"/>
     <Modifier name="verbose canvas cursor" modifier="= alpha:0.4666"/>
     <Modifier name="region mark" modifier="= alpha:1.0"/>
   </Modifiers>