diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-02-08 14:09:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-02-08 14:09:42 +0000 |
| commit | 87fdfecf74d2a379cb9969bfacfe4bdf07401ba3 (patch) | |
| tree | 03b9fa4f729fe86bc4910f85787204cba70d2016 /gtk2_ardour | |
| parent | 4fca993a840368e8313827676f7a63e1c79af32d (diff) | |
Change the background colour of regions when they are small enough to not show the name bar (#3575).
git-svn-id: svn://localhost/ardour2/branches/3.0@8771 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 16 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 11 |
2 files changed, 19 insertions, 8 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 52980e7270..a95e8a05a4 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -2868,12 +2868,16 @@ MidiRegionView::note_mouse_position (float x_fraction, float /*y_fraction*/, boo void MidiRegionView::set_frame_color() { - if (frame) { - if (_selected) { - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); - } else { - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get(); - } + if (!frame) { + return; + } + + if (_selected) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); + } else if (high_enough_for_name) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get(); + } else { + frame->property_fill_color_rgba() = fill_color; } } diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index f0dd9a7984..8220536508 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -531,6 +531,7 @@ TimeAxisViewItem::set_height (double height) vestigial_frame->property_y2() = height - 1; update_name_pixbuf_visibility (); + set_colors (); } void @@ -691,13 +692,19 @@ TimeAxisViewItem::set_frame_color() } else { if (_recregion) { frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); - } else { + } else if (high_enough_for_name) { if (fill_opacity) { frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_FrameBase.get(), fill_opacity); } else { frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameBase.get(); } - } + } else { + if (fill_opacity) { + frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (fill_color, fill_opacity); + } else { + frame->property_fill_color_rgba() = fill_color; + } + } } } |