diff options
| author | Doug McLain <doug@nostar.net> | 2008-04-17 09:33:54 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2008-04-17 09:33:54 +0000 |
| commit | 6962547e8da2f17ace5dc73906ef612ff737cfa3 (patch) | |
| tree | 323023e74098c13d6332e4f0df5847594cacdc69 /gtk2_ardour/time_axis_view_item.cc | |
| parent | 803b502bf176c417a70498a98173fb09691a80b7 (diff) | |
What used to be the pink recording rectangle is now blended into the recording regions so that they appear to be the same thing. Then recording specific colors are added so the waveform and region base when recording are all various shades of red during recording. *** Open Theme Manager and click Restore Defaults for these changes to apply ***
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3259 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view_item.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 7b74030403..a659eba79c 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -69,9 +69,9 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH; * @param duration the duration of this item */ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, - nframes_t start, nframes_t duration, + nframes_t start, nframes_t duration, bool recording, Visibility vis) - : trackview (tv) + : trackview (tv), _recregion(recording) { if (!have_name_font) { @@ -798,8 +798,13 @@ TimeAxisViewItem::set_frame_color() 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);// 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); + if (_recregion) { + UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a); + frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a); + } 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); + } } } } @@ -1043,3 +1048,4 @@ TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src) item = 0; return false; } + |