first vaguely working version using PresentationInfo

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index db586eed7e15393a28213f516ad037acaa9aff29..e9977b0b512c8a53369229e0233ff879451c2422 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -22,16 +22,23 @@
 #include "gtkmm2ext/utils.h"
 
 #include "ardour/route_group.h"
+
+#include "canvas/colors.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 "route_group_dialog.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
@@ -56,6 +63,10 @@ MixerGroupTabs::compute_tabs () const
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
+               if (!s) {
+                       continue;
+               }
+
                if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
                }
@@ -76,7 +87,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) {
@@ -91,13 +104,17 @@ void
 MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
        double const arc_radius = get_height();
+       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);
+               ArdourCanvas::color_to_rgba (tab.color, r, g, b, a);
        } else {
-               cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
+               ArdourCanvas::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_arc (cr, tab.from + arc_radius, get_height(), arc_radius, M_PI, 3 * M_PI / 2);
        cairo_line_to (cr, tab.to - arc_radius, 0);
        cairo_arc (cr, tab.to - arc_radius, get_height(), arc_radius, 3 * M_PI / 2, 2 * M_PI);
@@ -110,7 +127,10 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
 
-               cairo_set_source_rgb (cr, 1, 1, 1);
+               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);
                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());
@@ -135,9 +155,13 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
-               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 */
@@ -156,26 +180,6 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
        return routes;
 }
 
-PropertyList
-MixerGroupTabs::default_properties () const
-{
-       PropertyList plist;
-
-       plist.add (Properties::active, true);
-       plist.add (Properties::mute, true);
-       plist.add (Properties::solo, true);
-       plist.add (Properties::gain, true);
-       plist.add (Properties::recenable, true);
-
-       return plist;
-}
-
-string
-MixerGroupTabs::order_key () const
-{
-       return X_("signal");
-}
-
 RouteList
 MixerGroupTabs::selected_routes () const
 {
@@ -189,8 +193,3 @@ MixerGroupTabs::selected_routes () const
        return rl;
 }
 
-void
-MixerGroupTabs::sync_order_keys ()
-{
-       _mixer->sync_order_keys ("");
-}