From c876aea64dc57f59937f8bb2337f6ffc19b98c0d Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 25 Nov 2016 04:50:46 +1100 Subject: midi ghost region fill colour is per event. don't store it. ensure _outline is set. --- gtk2_ardour/ghostregion.cc | 11 +++++++---- gtk2_ardour/ghostregion.h | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index 1936609e8a..494b13e47f 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -181,6 +181,8 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv, : GhostRegion(rv, tv.ghost_group(), tv, source_tv, initial_unit_pos) , _optimization_iterator(events.end()) { + set_colors(); + base_rect->lower_to_bottom(); update_range (); @@ -203,6 +205,8 @@ MidiGhostRegion::MidiGhostRegion(RegionView& rv, initial_unit_pos) , _optimization_iterator(events.end()) { + set_colors(); + base_rect->lower_to_bottom(); update_range (); @@ -265,11 +269,10 @@ void MidiGhostRegion::set_colors() { GhostRegion::set_colors(); + _outline = UIConfiguration::instance().color ("ghost track midi outline"); for (EventList::iterator it = events.begin(); it != events.end(); ++it) { - _fill = UIConfiguration::instance().color_mod((*it)->event->base_color(), "ghost track midi fill"); - _outline = UIConfiguration::instance().color ("ghost track midi outline"); - (*it)->item->set_fill_color (_fill); + (*it)->item->set_fill_color (UIConfiguration::instance().color_mod((*it)->event->base_color(), "ghost track midi fill")); (*it)->item->set_outline_color (_outline); } } @@ -333,7 +336,7 @@ MidiGhostRegion::add_note (NoteBase* n) GhostEvent* event = new GhostEvent (n, group); events.push_back (event); - event->item->set_fill_color (_fill); + event->item->set_fill_color (UIConfiguration::instance().color_mod(n->base_color(), "ghost track midi fill")); event->item->set_outline_color (_outline); MidiStreamView* mv = midi_view(); diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index cf3146be44..a46ab8fe11 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -116,7 +116,6 @@ public: void clear_events(); private: - ArdourCanvas::Color _fill; ArdourCanvas::Color _outline; MidiGhostRegion::GhostEvent* find_event (NoteBase*); -- cgit v1.2.3