add more controllable modifiers for region transparency

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index 5c3e8bb719a7f6c0260b43810a0615ba634c0c30..2b543b2aacbf4f0dd612a37defe048932460ee3b 100644 (file)
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -499,6 +499,8 @@
     <Modifier name="piano roll white" modifier="= alpha:0.4627"/>
     <Modifier name="recording rect" modifier="= alpha:0.25"/>
     <Modifier name="region base" modifier="= alpha:0.99"/>
+    <Modifier name="opaque region base" modifier="= alpha:0.99"/>
+    <Modifier name="transparent region base" modifier="= alpha:0.50"/>
     <Modifier name="selected midi note" modifier="= alpha:0.7529"/>
     <Modifier name="selection rect" modifier="= alpha:0.4666"/>
     <Modifier name="silence" modifier="= alpha:0.4784"/>

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index c9c423e68a8d7a5b159ab8f41bdccfc72d585a50..93b8fa3321c7f3583150558784ce25d73f5e55df 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -525,11 +525,16 @@ RegionView::set_colors ()
 uint32_t
 RegionView::get_fill_color () const
 {
-       uint32_t f = TimeAxisViewItem::get_fill_color();
+       ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color();
+       char const *modname;
+       
        if (_region->opaque()) {
-               f = UINT_RGBA_CHANGE_A (f, 255);
+               modname = "opaque region base";
+       } else {
+               modname = "transparent region base";
        }
-       return f;
+
+       return HSV(f).mod (ARDOUR_UI::config()->modifier (modname)).color ();
 }
 
 void