X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_group_tabs.cc;h=44b63bae384d3c28a9aadff39e4fc57adf9c28a4;hb=20fb871d5ac252c820bc8dc38403b2fbb4e4aca8;hp=d02181c9b6c56b8f715a87d2c9728fe783edbebe;hpb=52003be3695ab703b936163d7284e208790d5363;p=ardour.git

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index d02181c9b6..44b63bae38 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -20,16 +20,23 @@
 #include "gtkmm2ext/utils.h"
 
 #include "ardour/route_group.h"
-#include "editor_group_tabs.h"
+
+#include "gtkmm2ext/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)
@@ -80,16 +87,20 @@ EditorGroupTabs::compute_tabs () const
 }
 
 void
-EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
+EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab)
 {
 	double const arc_radius = get_width();
+	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);
+		Gtkmm2ext::color_to_rgba (tab.color, r, g, b, a);
 	} else {
-		cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
+		Gtkmm2ext::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, get_width(), tab.from + arc_radius, arc_radius, M_PI, 3 * M_PI / 2);
 	cairo_line_to (cr, get_width(), tab.to);
@@ -97,17 +108,26 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 	cairo_line_to (cr, 0, tab.from + arc_radius);
 	cairo_fill (cr);
 
-	if (tab.group) {
-		pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+	if (tab.group && (tab.to - tab.from) > arc_radius) {
+		int text_width, text_height;
 
-		cairo_text_extents_t ext;
-		cairo_text_extents (cr, tab.group->name().c_str(), &ext);
+		Glib::RefPtr<Pango::Layout> layout;
+		layout = Pango::Layout::create (get_pango_context ());
+		layout->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
+
+		layout->set_text (tab.group->name ());
+		layout->set_width ((tab.to - tab.from - arc_radius) * PANGO_SCALE);
+		layout->get_pixel_size (text_width, text_height);
+
+		cairo_move_to (cr, (get_width() - text_height) * .5, (text_width + tab.to + tab.from) * .5);
+
+		Gtkmm2ext::Color c = Gtkmm2ext::contrasting_text_color (Gtkmm2ext::rgba_to_color (r, g, b, a));
+		Gtkmm2ext::color_to_rgba (c, r, g, b, a);
+		cairo_set_source_rgb (cr, r, g, b);
 
-		cairo_set_source_rgb (cr, 1, 1, 1);
-		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());
+		cairo_rotate (cr, M_PI * -.5);
+		pango_cairo_show_layout (cr, layout->gobj ());
 		cairo_restore (cr);
 	}
 }
@@ -163,19 +183,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);
-
-	return plist;
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {
@@ -191,8 +198,3 @@ EditorGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-EditorGroupTabs::sync_order_keys ()
-{
-	_editor->_routes->sync_order_keys_from_treeview ();
-}