ardour/livetrax
13
0
Fork 0
Code

Minor tidy-up.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8768 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-08 14:06:58 +00:00
parent d9c4625ff5
commit ff6038a7b7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk2_ardour/time_axis_view_item.cc
View File

@ -694,19 +694,20 @@ TimeAxisViewItem::set_colors()
void void
TimeAxisViewItem::set_frame_color() TimeAxisViewItem::set_frame_color()
{ {
if (frame) { if (!frame) {
uint32_t r,g,b,a; return;
}
if (_selected && should_show_selection) {
UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a); if (_selected && should_show_selection) {
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a); frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
} else {
if (_recregion) {
frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
} else { } else {
if (_recregion) { if (fill_opacity) {
UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a); frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_FrameBase.get(), fill_opacity);
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
} else { } else {
UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameBase.get();
frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
} }
} }
} }