use running_from_source_tree()

[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 7d8bb99b481ce2687ec1dd6bc7b6093470e93fcf..373e5eee1a2cea714b3d649f56b2bf0b4eb4eb0c 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -61,7 +61,12 @@ MixerGroupTabs::compute_tabs () const
        TreeModel::Children rows = _mixer->track_model->children ();
        for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-               MixerStrip* s = (*i)[_mixer->track_columns.strip];
+               AxisView* av = (*i)[_mixer->stripable_columns.strip];
+               MixerStrip* s = dynamic_cast<MixerStrip*> (av);
+
+               if (!s) {
+                       continue;
+               }
 
                if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
@@ -83,7 +88,9 @@ MixerGroupTabs::compute_tabs () const
                        }
                }
 
-               x += s->get_width ();
+               int ww = 0, wh = 0;
+               s->get_size_request (ww, wh); // widget may not be realized, get_width() is invalid.
+               x += ww;
        }
 
        if (tab.group) {
@@ -99,13 +106,13 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
        double const arc_radius = get_height();
        double r, g, b, a;
-       
+
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
                ArdourCanvas::color_to_rgba (UIConfiguration::instance().color ("inactive group tab"), r, g, b, a);
        }
-       
+
        a = 1.0;
 
        cairo_set_source_rgba (cr, r, g, b, a);
@@ -120,7 +127,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
-               
+
                ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
                ArdourCanvas::color_to_rgba (c, r, g, b, a);
 
@@ -147,11 +154,16 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
        TreeModel::Children rows = _mixer->track_model->children ();
        for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
 
-               MixerStrip* s = (*i)[_mixer->track_columns.strip];
+               AxisView* av = (*i)[_mixer->stripable_columns.strip];
+               MixerStrip* s = dynamic_cast<MixerStrip*> (av);
+
+               if (!s) {
+                       continue;
+               }
 
-               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
-                       continue;
-               }
+               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
+                       continue;
+               }
 
                if (x >= t->to) {
                        /* tab finishes before this track starts */
@@ -183,8 +195,3 @@ MixerGroupTabs::selected_routes () const
        return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-       _mixer->sync_order_keys_from_treeview ();
-}