Fix uninitialized variable

[ardour.git] / gtk2_ardour / editor_group_tabs.cc

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index aa58ed2f129ef81482c97adaf3b3fd08c4bd7ec5..44b63bae384d3c28a9aadff39e4fc57adf9c28a4 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -21,18 +21,18 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_group_tabs.h"
 #include "editor_route_groups.h"
 #include "editor_routes.h"
 #include "rgb_macros.h"
 #include "route_time_axis.h"
+#include "ui_config.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -87,15 +87,15 @@ 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()) {
-               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;
@@ -108,20 +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);
 
-               ArdourCanvas::Color c = ArdourCanvas::contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
-               ArdourCanvas::color_to_rgba (c, r, g, b, a);
+               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_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);
        }
 }
@@ -192,8 +198,3 @@ EditorGroupTabs::selected_routes () const
        return rl;
 }
 
-void
-EditorGroupTabs::sync_order_keys ()
-{
-       _editor->_routes->sync_order_keys_from_treeview ();
-}