X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_group_tabs.cc;h=8b5907c7d8ecef2302a8848130ed02e144ebf58d;hb=78f749ef65e725eee82938df76f24c2b6811a519;hp=4b33f1e34618c94bb619b0162ba653b2d97b4d37;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 4b33f1e346..8b5907c7d8 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -23,17 +23,17 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/colors.h"
+#include "gtkmm2ext/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 "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -61,11 +61,21 @@ 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;
 		}
+#ifdef MIXBUS
+		if (s->route()->mixbus()) {
+			continue;
+		}
+#endif
 
 		RouteGroup* g = s->route_group ();
 
@@ -83,7 +93,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) {
@@ -95,17 +107,17 @@ MixerGroupTabs::compute_tabs () const
 }
 
 void
-MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
+MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab)
 {
 	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);
+		Gtkmm2ext::color_to_rgba (tab.color, r, g, b, a);
 	} else {
-		ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
+		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);
@@ -115,20 +127,24 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 	cairo_line_to (cr, tab.from, get_height());
 	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;
+
+		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_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_move_to (cr, tab.from + (tab.to - tab.from - text_width) * .5, (get_height () - text_height) * .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_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);
+
+		pango_cairo_show_layout (cr, layout->gobj ());
 	}
 }
 
@@ -147,11 +163,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 */
@@ -174,8 +195,8 @@ 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 +204,3 @@ MixerGroupTabs::selected_routes () const
 	return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-	_mixer->sync_order_keys_from_treeview ();
-}