replace rather than append to SUIL_MODULE_DIR

[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 9b21432fefc54ab85a26ded54abdc2f4881ea5e3..997a115b7120b5d2a659dad39a9045505e15aee4 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -17,6 +17,8 @@
 
 */
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
 #include "editor_group_tabs.h"
 #include "editor.h"
@@ -80,7 +82,7 @@ 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();
 
        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);
@@ -89,20 +91,20 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        }
 
        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);
+               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());
@@ -170,15 +172,14 @@ EditorGroupTabs::default_properties () const
        plist.add (Properties::mute, true);
        plist.add (Properties::solo, true);
        plist.add (Properties::recenable, true);
-       plist.add (Properties::edit, true);
 
        return plist;
 }
 
-string
+RouteSortOrderKey
 EditorGroupTabs::order_key () const
 {
-       return X_("editor");
+       return EditorSort;
 }
 
 RouteList
@@ -199,5 +200,5 @@ EditorGroupTabs::selected_routes () const
 void
 EditorGroupTabs::sync_order_keys ()
 {
-       _editor->_routes->sync_order_keys ("");
+       _editor->_routes->sync_order_keys_from_treeview ();
 }