diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 01:54:01 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 01:54:01 +0000 |
| commit | 9b36d0c57d382c08a14faa1d1fd682f913da26c8 (patch) | |
| tree | 85ef1ff95c04c63b914404d93de22bbe56d6606a /gtk2_ardour/audio_region_view.cc | |
| parent | dbae21f78c22462879d1b476db2778485eeaab48 (diff) | |
Move selected/unselected region/waveform colours to colour file for configurability.
Changed the region selection colour in the default theme to match the track selection colour (and the tool one, and the MIDI one in 3.0, and....).
(Note: If someone hates these colours, the old "reverse video" like behaviour can still be done in the colour file or w/ the theme manager).
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index a440de50da..8f5413560a 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1178,14 +1178,15 @@ AudioRegionView::set_frame_color () uint32_t r,g,b,a; if (_selected && should_show_selection) { - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a); + frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a); - 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) { if (_region->muted()) { - (*w)->property_wave_color() = RGBA_TO_UINT(r, g, b, MUTED_ALPHA); + (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), 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 + (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(); + (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get(); } } } else { |