add vector rendition of nudge icons.

[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 f53326636ef49de057f970d09d8a435b73835be3..aa58ed2f129ef81482c97adaf3b3fd08c4bd7ec5 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -21,8 +21,9 @@
 
 #include "ardour/route_group.h"
 
-#include "canvas/utils.h"
+#include "canvas/colors.h"
 
+#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_group_tabs.h"
 #include "editor_route_groups.h"
@@ -35,6 +36,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 EditorGroupTabs::EditorGroupTabs (Editor* e)
        : EditorComponent (e)
@@ -93,9 +95,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        if (tab.group && tab.group->is_active()) {
                ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               r = 0.0;
-               g = 0.0;
-               b = 0.0;
+               ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("inactive group tab"), r, g, b, a);
        }
 
        a = 1.0;
@@ -114,7 +114,7 @@ EditorGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
 
-               ArdourCanvas::Color c = contrasting_text_color (ArdourCanvas::rgba_to_color (r, g, b, a));
+               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);
@@ -177,19 +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);
-
-       return plist;
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {