diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-09 18:26:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-09 18:26:47 +0000 |
| commit | 9c88023faf6d63806fa747eda541294f22a1e5f3 (patch) | |
| tree | 0e7891587cf986aa9c2b4bd0de6587982a1c4c32 /gtk2_ardour/audio_region_view.cc | |
| parent | b007f7fe621e8390b41df5a725fbb697d3d69fb9 (diff) | |
make separate work with/without selected tracks; make align-regions-*-relative work correctly; make waveform muted color show correctly
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2855 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 10fdba8974..a818fc0407 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -51,7 +51,7 @@ #include "i18n.h" -#define MUTED_ALPHA 0x50 +#define MUTED_ALPHA 10 using namespace sigc; using namespace ARDOUR; @@ -1185,14 +1185,22 @@ AudioRegionView::set_frame_color () UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);// Lets still use the theme's opacity value if Opaque is not set + if (_region->muted()) { + (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, MUTED_ALPHA); + } else { + (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);// Lets still use the theme's opacity value if Opaque is not set + } } } else { UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a); for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + if (_region->muted()) { + (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA); + } else { + (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + } } } } |