diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-02-23 01:03:37 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-02-23 01:03:37 +0000 |
| commit | 1b8a919f572166fdd4746e8e06b067f8debb9466 (patch) | |
| tree | ce69f781fe2b48b9f84e552469c9fe0d3593c44b /gtk2_ardour/route_time_axis.cc | |
| parent | 2daa616e02aeaf40d898b0c61e4993c3952235e5 (diff) | |
Small clean up of route colour setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@8933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 73dcf5d9a3..957dfcd88f 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -441,7 +441,7 @@ RouteTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); display_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Color..."), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); + items.push_back (MenuElem (_("Color..."), sigc::hide_return (sigc::mem_fun (*this, &RouteUI::choose_color)))); build_size_menu (); items.push_back (MenuElem (_("Height"), *_size_menu)); @@ -863,13 +863,12 @@ RouteTimeAxisView::set_height (uint32_t h) } void -RouteTimeAxisView::select_track_color () +RouteTimeAxisView::set_color (Gdk::Color const & c) { - if (RouteUI::choose_color ()) { - - if (_view) { - _view->apply_color (_color, StreamView::RegionColor); - } + RouteUI::set_color (c); + + if (_view) { + _view->apply_color (_color, StreamView::RegionColor); } } |