set a theme color for VCA axes in the editor

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 44ce956afd4f399a1bb2b64a9f52d576eac371c7..a8eed741799363b99bbdfc57e2787e7c4a60bc10 100644 (file)
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -758,6 +758,21 @@ style "audio_track_base" = "default"
        bg[SELECTED] = @background
 }
 
+style "control_master_base" = "default"
+{
+       font_name = " 8"
+       # NORMAL is used for single-data type labels, or Audio
+       # ACTIVE is used for MIDI in the presence of multiple data type
+       fg[NORMAL] = @foreground
+       fg[ACTIVE] = darker(@foreground)
+
+       bg[NORMAL] = @control_master
+       bg[ACTIVE] = @background
+       bg[PRELIGHT] = @background
+       bg[INSENSITIVE] = @background
+       bg[SELECTED] = @background
+}
+
 style "midi_track_base" = "default"
 {
        font_name = " 8"
@@ -1110,6 +1125,7 @@ widget "*AudioMidiTrackMetricsInactive" style:highest "midi_track_metrics_inacti
 widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
+widget "*ControlMasterBaseUnselected" style:highest "control_master_base"
 
 widget "*SendUIFader" style:highest "plugin_slider"
 widget "*ReturnUIFader" style:highest "plugin_slider"

diff --git a/gtk2_ardour/themes/blueberry-milk-ardour.colors b/gtk2_ardour/themes/blueberry-milk-ardour.colors
index 0498e543bcb73ef52cd83e3dff1b464742b15d99..af542ef9bf37b46bfb6e119ed18777a815f76df8 100755 (executable)
--- a/gtk2_ardour/themes/blueberry-milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry-milk-ardour.colors
@@ -182,7 +182,7 @@
     <ColorAlias name="gtk_bright_color" alias="color 74"/>
     <ColorAlias name="gtk_bright_indicator" alias="color 9"/>
     <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/>
-    <ColorAlias name="gtk_control_base" alias="color 61"/>
+    <ColorAlias name="gtk_control_master" alias="color 64"/>
     <ColorAlias name="gtk_control_text" alias="color 29"/>
     <ColorAlias name="gtk_control_text2" alias="color 83"/>
     <ColorAlias name="gtk_darkest" alias="color 81"/>

diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 6bc96eef12b310948aa676e15a5c63ee198a2cd3..b80b1dcc1e7cb2e8316efe30f201db466d56639c 100755 (executable)
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -182,7 +182,7 @@
     <ColorAlias name="gtk_bright_color" alias="color 74"/>
     <ColorAlias name="gtk_bright_indicator" alias="color 9"/>
     <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/>
-    <ColorAlias name="gtk_control_base" alias="color 104"/>
+    <ColorAlias name="gtk_control_master" alias="color 64"/>
     <ColorAlias name="gtk_control_text" alias="color 26"/>
     <ColorAlias name="gtk_control_text2" alias="color 83"/>
     <ColorAlias name="gtk_darkest" alias="color 67"/>

diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 49bbb0370ffc2d3f404e126caff668709536f068..2e33bbdcb14f76906da055c11c1a2e7c93619201 100755 (executable)
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -182,7 +182,7 @@
     <ColorAlias name="gtk_bright_color" alias="color 74"/>
     <ColorAlias name="gtk_bright_indicator" alias="color 9"/>
     <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/>
-    <ColorAlias name="gtk_control_base" alias="color 104"/>
+    <ColorAlias name="gtk_control_master" alias="color 64"/>
     <ColorAlias name="gtk_control_text" alias="color 26"/>
     <ColorAlias name="gtk_control_text2" alias="color 83"/>
     <ColorAlias name="gtk_darkest" alias="color 67"/>

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 814613b99baec577353bbc7253dd2f2922968c3d..ed37a8fb4215d0a12a1c286227bdd65d83248074 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -174,6 +174,7 @@
     <ColorAlias name="gtk_arm" alias="color 9"/>
     <ColorAlias name="gtk_audio_bus" alias="color 61"/>
     <ColorAlias name="gtk_audio_track" alias="color 70"/>
+    <ColorAlias name="gtk_control_master" alias="color 64"/>
     <ColorAlias name="gtk_automation_track_header" alias="color 42"/>
     <ColorAlias name="gtk_background" alias="color 34"/>
     <ColorAlias name="gtk_bases" alias="color 27"/>
@@ -183,7 +184,6 @@
     <ColorAlias name="gtk_bright_color" alias="color 74"/>
     <ColorAlias name="gtk_bright_indicator" alias="color 9"/>
     <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/>
-    <ColorAlias name="gtk_control_base" alias="color 61"/>
     <ColorAlias name="gtk_control_text" alias="color 26"/>
     <ColorAlias name="gtk_control_text2" alias="color 83"/>
     <ColorAlias name="gtk_darkest" alias="color 67"/>

diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index ab222eed7a0ea14078dc9390a2f1401bcaf82db0..fd0c1484ebe43666a19d82670a685bb44531a4f7 100644 (file)
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -187,7 +187,7 @@
                <ColorAlias name="gtk_bright_color" alias="color 74"/>
                <ColorAlias name="gtk_bright_indicator" alias="color 1"/>
                <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/>
-               <ColorAlias name="gtk_control_base" alias="color 104"/>
+               <ColorAlias name="gtk_control_master" alias="color 64"/>
                <ColorAlias name="gtk_control_text" alias="color 26"/>
                <ColorAlias name="gtk_control_text2" alias="color 83"/>
                <ColorAlias name="gtk_darkest" alias="color 67"/>

diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc
index ad4bd5c5895e7ebbb64a3e7ff81906f71e924827..da3a3503f7c753b6ec6d7cdd4f017e6b5262d11a 100644 (file)
--- a/gtk2_ardour/vca_master_strip.cc
+++ b/gtk2_ardour/vca_master_strip.cc
@@ -510,4 +510,3 @@ VCAMasterStrip::stripable () const
 {
        return _vca;
 }
-

diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc
index becc14dce9a8d9c71df7e3c7d0571fe56f53f372..fbc57c5eaaf8ec3f279fe849cb1bfc3d3de2c5be 100644 (file)
--- a/gtk2_ardour/vca_time_axis.cc
+++ b/gtk2_ardour/vca_time_axis.cc
@@ -83,6 +83,9 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
        spill_button.show ();
        gain_meter.get_gain_slider().show ();
 
+       controls_ebox.set_name ("ControlMasterBaseUnselected");
+       time_axis_frame.set_name ("ControlMasterBaseUnselected");
+
        s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
        Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
        UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &VCATimeAxisView::parameter_changed));