X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=da227fedbb1487a4fc60f9811e3014bb1cbbba20;hb=3d1f955a0cf33bc57a9159ee844f6d13297bbe22;hp=b74455b28d77c4231128bb659ff36caf87b79a7e;hpb=7d32cf3813b7145b98c86b59867092e04aa2621a;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index b74455b28d..da227fedbb 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -17,18 +17,28 @@
 
 */
 
+#include <boost/foreach.hpp>
+
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
-#include "ardour/session.h"
+
+#include "canvas/colors.h"
+
+#include "ardour_ui.h"
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
+#include "rgb_macros.h"
+#include "route_group_dialog.h"
 #include "utils.h"
+
 #include "i18n.h"
-#include "route_group_dialog.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
@@ -87,28 +97,35 @@ 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();
+	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 (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
 	}
+	
+	a = 1.0;
 
-	cairo_arc (cr, tab.from + arc_radius, _height, arc_radius, M_PI, 3 * M_PI / 2);
+	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, _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);
+		
+		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, 1, 1, 1);
-		cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
+		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());
 		cairo_restore (cr);
@@ -167,20 +184,21 @@ MixerGroupTabs::default_properties () const
 	return plist;
 }
 
-string
-MixerGroupTabs::order_key () const
-{
-	return X_("signal");
-}
-
 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
 MixerGroupTabs::sync_order_keys ()
 {
-	_mixer->sync_order_keys ("");
+	_mixer->sync_order_keys_from_treeview ();
 }