From a0e399f7dd15a69c25660f4a4bb58b12f27297a6 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 30 Jun 2014 10:14:06 -0400
Subject: make inactive group tab color be themeable and update it dynamically

---
 gtk2_ardour/ardour3_ui_default.conf.in | 1 +
 gtk2_ardour/canvas_vars.h              | 1 +
 gtk2_ardour/editor_group_tabs.cc       | 5 ++---
 gtk2_ardour/group_tabs.cc              | 2 ++
 gtk2_ardour/mixer_group_tabs.cc        | 5 ++---
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ardour3_ui_default.conf.in
index 6d851a376c..2f76f369c8 100644
--- a/gtk2_ardour/ardour3_ui_default.conf.in
+++ b/gtk2_ardour/ardour3_ui_default.conf.in
@@ -45,6 +45,7 @@
     <Option name="image track" value="ddddd8ff"/>
     <Option name="inactive crossfade" value="e8ed3d77"/>
     <Option name="inactive fade handle" value="bbbbbbaa"/>
+    <Option name="inactive group tab" value="000000aa"/>
     <Option name="location cd marker" value="1ee8c4ff"/>
     <Option name="location loop" value="35964fff"/>
     <Option name="location marker" value="c4f411ff"/>
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 3bcd85c246..4277149a35 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -52,6 +52,7 @@ CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
 CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
 CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
 CANVAS_VARIABLE(canvasvar_InactiveFadeHandle, "inactive fade handle")
+CANVAS_VARIABLE(canvasvar_InactiveGroupTab, "inactive group tab")
 CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
 CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
 CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index fb7081df2c..af5e63bd55 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -23,6 +23,7 @@
 
 #include "canvas/utils.h"
 
+#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_group_tabs.h"
 #include "editor_route_groups.h"
@@ -94,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()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
 	}
 
 	a = 1.0;
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index a996cd8dff..b64713362a 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -24,6 +24,7 @@
 
 #include "gui_thread.h"
 #include "route_group_dialog.h"
+#include "global_signals.h"
 #include "group_tabs.h"
 #include "keyboard.h"
 #include "i18n.h"
@@ -45,6 +46,7 @@ GroupTabs::GroupTabs ()
 	, _dragging_new_tab (0)
 {
 	add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
+	ColorsChanged.connect (sigc::mem_fun (*this, &GroupTabs::queue_draw));	
 }
 
 GroupTabs::~GroupTabs ()
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index e7c14ca113..7f9f1f0e53 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -25,6 +25,7 @@
 
 #include "canvas/utils.h"
 
+#include "ardour_ui.h"
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
@@ -102,9 +103,7 @@ MixerGroupTabs::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()->get_canvasvar_InactiveGroupTab(), r, g, b, a);
 	}
 	
 	a = 1.0;
-- 
cgit v1.2.3