Expand just entry fields when the dialog is expanded

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index b74455b28d77c4231128bb659ff36caf87b79a7e..6482abebc2ad7f653b8200635824c4a4a987790e 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -17,6 +17,10 @@
 
 */
 
+#include <boost/foreach.hpp>
+
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "mixer_group_tabs.h"
@@ -87,7 +91,7 @@ MixerGroupTabs::compute_tabs () const
 void
 MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
-       double const arc_radius = _height;
+       double const arc_radius = get_height();
 
        if (tab.group && tab.group->is_active()) {
                cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1);
@@ -95,20 +99,20 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
                cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
        }
 
-       cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2);
+       cairo_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2);
        cairo_line_to (cr, tab.to - arc_radius, 0);
-       cairo_arc (cr, tab.to - arc_radius, _height, arc_radius, 3 * M_PI / 2, 2 * M_PI);
-       cairo_line_to (cr, tab.from, _height);
+       cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI);
+       cairo_line_to (cr, tab.from, get_height());
        cairo_fill (cr);
 
        if (tab.group) {
-               pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+               pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
 
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
 
                cairo_set_source_rgb (cr, 1, 1, 1);
-               cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
+               cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, get_height() - ext.height / 2);
                cairo_save (cr);
                cairo_show_text (cr, f.first.c_str());
                cairo_restore (cr);
@@ -176,7 +180,14 @@ MixerGroupTabs::order_key () const
 RouteList
 MixerGroupTabs::selected_routes () const
 {
-       return _mixer->selection().routes;
+       RouteList rl;
+       BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) {
+               boost::shared_ptr<Route> rp = r->route();
+               if (rp) {
+                       rl.push_back (rp);
+               }
+       }
+       return rl;
 }
 
 void