Colour lower stacked regions with a lighter colour and make it configurable (#4835).

git-svn-id: svn://localhost/ardour2/branches/3.0@12708 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index b578556b12245fae37a4e3a281b65a8043e7f429..0cdf195798505a670005f4ec927e53a42453809f 100644 (file)
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -139,6 +139,7 @@
     <Option name="verbose canvas cursor" value="fffd2ebc"/>
     <Option name="vestigial frame" value="0000000f"/>
     <Option name="region base" value="99a7b5a0"/>
+    <Option name="region area covered by another region" value="505050b0"/>
     <Option name="waveform outline" value="0f0f0fc8"/>
     <Option name="clipped waveform" value="ff0000e5"/>
     <Option name="waveform fill" value="3d4753dc"/>

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 975f5eb2af436dafb5bc062b218a55ec1fb3b25f..672d4e1256755db1e78c7e3169f43e9c73bc461e 100644 (file)
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -133,6 +133,7 @@ CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
 CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
 CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
 CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
+CANVAS_VARIABLE(canvasvar_CoveredRegion, "region area covered by another region")
 CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
 CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
 CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 5c6a452b6137a0f725cf03cf2d3fb56736e8abd9..312666c18a7a0965f0f60b1d56300082d4197493 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -779,7 +779,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
        bool me = false;
 
        /* the color that will be used to show parts of regions that will not be heard */
-       uint32_t non_playing_color = RGBA_TO_UINT (32, 32, 32, 192);
+       uint32_t const non_playing_color = ARDOUR_UI::config()->canvasvar_CoveredRegion.get ();
 
        while (t < end) {