X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgroup_tabs.cc;h=08dfe539a2179f36433d0a705742993eaae86a20;hb=b78cb4d41aa59311e46ca9d9101c1b5f6107e415;hp=4f194235e286251bad682b40220cabd0f79fb9f9;hpb=9f1b50cc3e953473240949abf083e0124fcae2af;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 4f194235e2..08dfe539a2 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -56,7 +56,16 @@ GroupTabs::set_session (Session* s) SessionHandlePtr::set_session (s); if (_session) { - _session->RouteGroupChanged.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); + _session->RouteGroupPropertyChanged.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_group_property_changed, this, _1), gui_context() + ); + _session->RouteAddedToRouteGroup.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_added_to_route_group, this, _1, _2), gui_context() + ); + _session->RouteRemovedFromRouteGroup.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_removed_from_route_group, this, _1, _2), gui_context() + ); + _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); } } @@ -104,6 +113,7 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else { _dragging_new_tab = false; + _initial_dragging_routes = routes_for_tab (t); } _dragging = t; @@ -124,11 +134,17 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { RouteGroup* g = t ? t->group : 0; - Menu* m = get_menu (g); - if (m) { - m->popup (ev->button, ev->time); + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { + /* edit */ + RouteGroupDialog d (g, false); + d.do_run (); + } else { + Menu* m = get_menu (g); + if (m) { + m->popup (ev->button, ev->time); + } } - } return true; @@ -169,29 +185,18 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) if (_dragging == 0) { return false; } - + if (!_drag_moved) { - + if (_dragging->group) { - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - - /* edit */ - RouteGroupDialog d (_dragging->group, false); - d.do_run (); - - } else { - - /* toggle active state */ - _dragging->group->set_active (!_dragging->group->is_active (), this); - - } + /* toggle active state */ + _dragging->group->set_active (!_dragging->group->is_active (), this); } - + } else { /* finish drag */ RouteList routes = routes_for_tab (_dragging); - + if (!routes.empty()) { if (_dragging_new_tab) { RouteGroup* g = create_and_add_group (); @@ -203,25 +208,28 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } else { boost::shared_ptr r = _session->get_routes (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - - if (find (routes.begin(), routes.end(), *i) == routes.end()) { - /* this route is not contained in the tab we are dragging ... */ - if ((*i)->route_group() != _dragging->group) { - /* and it's not in the dragged tab's group either */ - _dragging->group->remove (*i); - } - } else { + + bool const was_in_tab = find ( + _initial_dragging_routes.begin(), _initial_dragging_routes.end(), *i + ) != _initial_dragging_routes.end (); + + bool const now_in_tab = find (routes.begin(), routes.end(), *i) != routes.end(); + + if (was_in_tab && !now_in_tab) { + _dragging->group->remove (*i); + } else if (!was_in_tab && now_in_tab) { _dragging->group->add (*i); } } } } - + set_dirty (); queue_draw (); } - + _dragging = 0; + _initial_dragging_routes.clear (); return true; } @@ -236,7 +244,7 @@ GroupTabs::render (cairo_t* cr) /* background */ cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, 0, 0, _width, _height); + cairo_rectangle (cr, 0, 0, get_width(), get_height()); cairo_fill (cr); /* tabs */ @@ -424,13 +432,24 @@ GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement) } struct CollectSorter { - CollectSorter (std::string const & key) : _key (key) {} + CollectSorter (string const & key) : _key (key) {} bool operator () (boost::shared_ptr a, boost::shared_ptr b) { return a->order_key (_key) < b->order_key (_key); } - std::string _key; + string _key; +}; + +struct OrderSorter { + OrderSorter (string const & key) : _key (key) {} + + bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + /* use of ">" forces the correct sort order */ + return a->order_key (_key) < b->order_key (_key); + } + + string _key; }; /** Collect all members of a RouteGroup so that they are together in the Editor or Mixer. @@ -445,6 +464,7 @@ GroupTabs::collect (RouteGroup* g) RouteList::iterator i = group_routes->begin (); boost::shared_ptr routes = _session->get_routes (); + routes->sort (OrderSorter (order_key ())); RouteList::const_iterator j = routes->begin (); int diff = 0; @@ -512,6 +532,11 @@ void GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color) { assert (group); + + /* Hack to disallow black route groups; force a dark grey instead */ + if (color.get_red() == 0 && color.get_green() == 0 && color.get_blue() == 0) { + color.set_grey_p (0.1); + } GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; @@ -524,9 +549,7 @@ GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color) for our routes. */ - for (RouteList::iterator i = group->route_list()->begin(); i != group->route_list()->end(); ++i) { - (*i)->gui_changed (X_("color"), 0); - } + emit_gui_changed_for_members (group); } /** @return the ID string to use for the GUI state of a route group */ @@ -573,3 +596,53 @@ GroupTabs::group_color (RouteGroup* group) return c; } +void +GroupTabs::route_group_property_changed (RouteGroup* rg) +{ + /* This is a bit of a hack, but this might change + our route's effective color, so emit gui_changed + for our routes. + */ + + emit_gui_changed_for_members (rg); + + set_dirty (); +} + +void +GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->gui_changed (X_("color"), 0); + + set_dirty (); +} + +void +GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->gui_changed (X_("color"), 0); + + set_dirty (); +} + +void +GroupTabs::emit_gui_changed_for_members (RouteGroup* rg) +{ + for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) { + (*i)->gui_changed (X_("color"), 0); + } +}