X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=63bb1a091f5f6cda414a797d3056977a3438c38d;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hp=5878c3d3acac0fed345e653d1b62dbc572047751;hpb=3f15584749d181197bffc65a25d5dcc94b06c34d;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 5878c3d3ac..63bb1a091f 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -22,16 +22,23 @@
 #include "gtkmm2ext/utils.h"
 
 #include "ardour/route_group.h"
+
+#include "canvas/colors.h"
+
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
-#include "utils.h"
-#include "i18n.h"
+#include "rgb_macros.h"
 #include "route_group_dialog.h"
+#include "ui_config.h"
+#include "utils.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
@@ -54,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;
@@ -76,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) {
@@ -91,13 +105,17 @@ void
 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()) {
-		cairo_set_source_rgba (cr, tab.color.get_red_p (), tab.color.get_green_p (), tab.color.get_blue_p (), 1);
+		ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
 	} else {
-		cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
+		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);
 	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, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI);
@@ -110,7 +128,10 @@ 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);
 
-		cairo_set_source_rgb (cr, 1, 1, 1);
+		ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
+		ArdourCanvas::color_to_rgba (c, r, g, b, a);
+
+		cairo_set_source_rgb (cr, r, g, b);
 		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());
@@ -133,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->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
-	 		continue;
-	 	}
+		if (!s) {
+			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 */
@@ -156,26 +182,12 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	return routes;
 }
 
-PropertyList
-MixerGroupTabs::default_properties () const
-{
-	PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::gain, true);
-	plist.add (Properties::recenable, true);
-
-	return plist;
-}
-
 RouteList
 MixerGroupTabs::selected_routes () const
 {
 	RouteList rl;
-	BOOST_FOREACH (RouteUI* r, _mixer->selection().routes) {
-		boost::shared_ptr<Route> rp = r->route();
+	BOOST_FOREACH (AxisView* r, _mixer->selection().axes) {
+		boost::shared_ptr<Route> rp = boost::dynamic_pointer_cast<Route> (r->stripable());
 		if (rp) {
 			rl.push_back (rp);
 		}
@@ -183,8 +195,3 @@ MixerGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-	_mixer->sync_order_keys_from_treeview ();
-}