X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_group_tabs.cc;h=04f88542bafd180d893d229f4b11d0380ce86120;hb=4093cf6b90e1479ed1589c587baa572b6047d383;hp=d98c064bffb094de2006be9262884a71df7ca28f;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index d98c064bff..04f88542ba 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -17,17 +17,26 @@
 
 */
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
-#include "editor_group_tabs.h"
+
+#include "canvas/colors.h"
+
 #include "editor.h"
-#include "route_time_axis.h"
-#include "utils.h"
+#include "editor_group_tabs.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
-#include "i18n.h"
+#include "rgb_macros.h"
+#include "route_time_axis.h"
+#include "ui_config.h"
+#include "utils.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 EditorGroupTabs::EditorGroupTabs (Editor* e)
 	: EditorComponent (e)
@@ -61,7 +70,9 @@ EditorGroupTabs::compute_tabs () const
 
 			tab.from = y;
 			tab.group = g;
-			tab.colour = (*i)->color ();
+			if (g) {
+				tab.color = group_color (g);
+			}
 		}
 
 		y += (*i)->effective_height ();
@@ -78,29 +89,36 @@ EditorGroupTabs::compute_tabs () const
 void
 EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
-	double const arc_radius = _width;
+	double const arc_radius = get_width();
+	double r, g, b, a;
 
 	if (tab.group && tab.group->is_active()) {
-		cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.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_move_to (cr, 0, tab.from + arc_radius);
-	cairo_arc (cr, _width, tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2);
-	cairo_line_to (cr, _width, tab.to);
-	cairo_arc (cr, _width, tab.to - arc_radius, arc_radius, M_PI / 2, M_PI);
+	cairo_arc (cr, get_width(), tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2);
+	cairo_line_to (cr, get_width(), tab.to);
+	cairo_arc (cr, get_width(), tab.to - arc_radius, arc_radius, M_PI / 2, M_PI);
 	cairo_line_to (cr, 0, tab.from + arc_radius);
 	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, _width - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
+		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, get_width() - ext.height / 2, tab.from + (f.second + tab.to - tab.from) / 2);
 		cairo_save (cr);
 		cairo_rotate (cr, - M_PI / 2);
 		cairo_show_text (cr, f.first.c_str());
@@ -159,26 +177,6 @@ EditorGroupTabs::add_menu_items (Gtk::Menu* m, RouteGroup* g)
 	}
 }
 
-PBD::PropertyList
-EditorGroupTabs::default_properties () const
-{
-	PBD::PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::recenable, true);
-	plist.add (Properties::edit, true);
-
-	return plist;
-}
-
-string
-EditorGroupTabs::order_key () const
-{
-	return X_("editor");
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {
@@ -194,8 +192,3 @@ EditorGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-EditorGroupTabs::sync_order_keys ()
-{
-	_editor->_routes->sync_order_keys ("");
-}