Small clean up of route colour setting.
git-svn-id: svn://localhost/ardour2/branches/3.0@8933 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
2daa616e02
commit
1b8a919f57
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -212,7 +212,7 @@ protected:
|
||||
void reset_samples_per_unit ();
|
||||
void horizontal_position_changed ();
|
||||
|
||||
void select_track_color();
|
||||
void set_color (Gdk::Color const &);
|
||||
|
||||
virtual void build_automation_action_menu ();
|
||||
virtual void append_extra_display_menu_items () {}
|
||||
|
@ -1258,12 +1258,10 @@ RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
|
||||
}
|
||||
|
||||
bool
|
||||
RouteUI::choose_color()
|
||||
RouteUI::choose_color ()
|
||||
{
|
||||
bool picked;
|
||||
Gdk::Color color;
|
||||
|
||||
color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
|
||||
Gdk::Color const color = Gtkmm2ext::UI::instance()->get_color (_("Color Selection"), picked, &_color);
|
||||
|
||||
if (picked) {
|
||||
set_color (color);
|
||||
|
@ -77,7 +77,7 @@ class RouteUI : public virtual AxisView
|
||||
|
||||
boost::shared_ptr<ARDOUR::Route> _route;
|
||||
|
||||
void set_color (const Gdk::Color & c);
|
||||
virtual void set_color (const Gdk::Color & c);
|
||||
bool choose_color ();
|
||||
|
||||
bool ignore_toggle;
|
||||
|
Loading…
Reference in New Issue
Block a user