Fix autoscroll fudge calculations. Remove some unused

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index e2f8e9905a2f9b3498bea6fe577ed2d2bdf4a8f7..08dfe539a2179f36433d0a705742993eaae86a20 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -134,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;
@@ -179,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 ();
@@ -213,13 +208,13 @@ GroupTabs::on_button_release_event (GdkEventButton* ev)
                        } else {
                                boost::shared_ptr<RouteList> r = _session->get_routes ();
                                for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-
+                                       
                                        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) {
@@ -228,11 +223,11 @@ GroupTabs::on_button_release_event (GdkEventButton* ev)
                                }
                        }
                }
-
+               
                set_dirty ();
                queue_draw ();
        }
-
+       
        _dragging = 0;
        _initial_dragging_routes.clear ();
 
@@ -249,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 */
@@ -437,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<Route> a, boost::shared_ptr<Route> 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<Route> a, boost::shared_ptr<Route> 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.
@@ -458,6 +464,7 @@ GroupTabs::collect (RouteGroup* g)
 
        RouteList::iterator i = group_routes->begin ();
        boost::shared_ptr<RouteList> routes = _session->get_routes ();
+       routes->sort (OrderSorter (order_key ()));
        RouteList::const_iterator j = routes->begin ();
 
        int diff = 0;
@@ -603,20 +610,22 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
 }
 
 void
-GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> w)
+GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr<Route> w)
 {
        /* Similarly-spirited hack as in route_group_property_changed */
-       
+
        boost::shared_ptr<Route> r = w.lock ();
        if (!r) {
                return;
        }
 
        r->gui_changed (X_("color"), 0);
+
+       set_dirty ();
 }
 
 void
-GroupTabs::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> w)
+GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w)
 {
        /* Similarly-spirited hack as in route_group_property_changed */
 
@@ -626,6 +635,8 @@ GroupTabs::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route
        }
 
        r->gui_changed (X_("color"), 0);
+
+       set_dirty ();
 }
 
 void