diff options
| author | David Robillard <d@drobilla.net> | 2014-11-13 23:33:11 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-11-13 23:33:11 -0500 |
| commit | a733a2a4c525fe021c66eb8b2eaccd3356462f75 (patch) | |
| tree | 15975e86358b2da9fbddddb4194e168316a22a65 | |
| parent | 8907477271b8a6b356127e2367753f0d6dbd5308 (diff) | |
Don't make MIDI regions in note mode completely invisible.
This makes for extremely confusing behaviour, particularly when creating new
regions. This is still probably too transparent, IMO, but at least isn't
totally mysterious. "visible" is a bit of a misnomer in the code, now.
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 24 |
2 files changed, 12 insertions, 14 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 08fab6ff86..d44b54bd8d 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3221,7 +3221,7 @@ MidiRegionView::set_frame_color() } if (!rect_visible) { - f = UINT_RGBA_CHANGE_A (f, 0); + f = UINT_RGBA_CHANGE_A (f, 80); } frame->set_fill_color (f); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index c698263d57..5948cebddd 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -719,12 +719,10 @@ uint32_t TimeAxisViewItem::fill_opacity () const { if (!rect_visible) { - /* if the frame/rect is marked as invisible, then the - * fill should be transparent. simplest: set - - * alpha/opacity to zero. - */ - return 0; + /* if the frame/rect is marked as "invisible", then the + fill should be translucent.parent. + */ + return 64; } if (_dragging) { @@ -781,19 +779,19 @@ TimeAxisViewItem::set_frame_color() return; } - frame->set_fill_color (get_fill_color()); + frame->set_fill_color (get_fill_color()); set_frame_gradient (); - if (!_recregion) { + if (!_recregion) { uint32_t f = ARDOUR_UI::config()->get_TimeAxisFrame(); - if (!rect_visible) { + if (!rect_visible) { /* make the frame outline be visible but rather transparent */ - f = UINT_RGBA_CHANGE_A (f, 64); - } + f = UINT_RGBA_CHANGE_A (f, 64); + } - frame->set_outline_color (f); - } + frame->set_outline_color (f); + } } void |