set initial TAV style

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index ed40be41911761f06c609c17cd9f9d96dbee3cd4..808f9729f04b9f933406057ba2a1fd98cd7f140c 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -95,8 +95,10 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        if (is_audio_track()) {
                controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
+               time_axis_frame.set_name ("AudioTrackControlsBaseUnselected");
        } else { // bus
                controls_ebox.set_name ("AudioBusControlsBaseUnselected");
+               time_axis_frame.set_name ("AudioBusControlsBaseUnselected");
        }
 
        /* if set_state above didn't create a gain automation child, we need to make one */
@@ -408,8 +410,10 @@ AudioTimeAxisView::update_control_names ()
        }
 
        if (get_selected()) {
+               controls_ebox.set_name (controls_base_selected_name);
                time_axis_frame.set_name (controls_base_selected_name);
        } else {
+               controls_ebox.set_name (controls_base_unselected_name);
                time_axis_frame.set_name (controls_base_unselected_name);
        }
 }

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index f474acd007b6ea335aef342c0b53ae87c1ea5e89..d92ac5c7482aae9e89b38b35d221dfa5d2b4f1cd 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -193,6 +193,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 
        controls_base_selected_name = X_("AutomationTrackControlsBaseSelected");
        controls_base_unselected_name = X_("AutomationTrackControlsBase");
+
+       controls_ebox.set_name (controls_base_unselected_name);
        time_axis_frame.set_name (controls_base_unselected_name);
 
        /* ask for notifications of any new RegionViews */

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 685f4693583ce74665ee653bb25f274aa93ab1b0..00f16ce1b67fc5cf3690ecb6bc4eaadc9fb40690 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -162,9 +162,11 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        if (is_midi_track()) {
                controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
+               time_axis_frame.set_name ("MidiTimeAxisViewControlsBaseUnselected");
                _note_mode = midi_track()->note_mode();
        } else { // MIDI bus (which doesn't exist yet..)
                controls_ebox.set_name ("MidiBusControlsBaseUnselected");
+               time_axis_frame.set_name ("MidiBusControlsBaseUnselected");
        }
 
        /* if set_state above didn't create a gain automation child, we need to make one */
@@ -232,6 +234,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                top_hbox.pack_end(*blank, false, false, 0);
 
                controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
+               time_axis_frame.set_name ("MidiTrackControlsBaseUnselected");
                controls_base_selected_name = "MidiTrackControlsBaseSelected";
                controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
 
@@ -1381,20 +1384,24 @@ MidiTimeAxisView::route_active_changed ()
        if (is_track()) {
                if (_route->active()) {
                        controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
+                       time_axis_frame.set_name ("MidiTrackControlsBaseUnselected");
                        controls_base_selected_name = "MidiTrackControlsBaseSelected";
                        controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
                } else {
                        controls_ebox.set_name ("MidiTrackControlsBaseInactiveUnselected");
+                       time_axis_frame.set_name ("MidiTrackControlsBaseInactiveUnselected");
                        controls_base_selected_name = "MidiTrackControlsBaseInactiveSelected";
                        controls_base_unselected_name = "MidiTrackControlsBaseInactiveUnselected";
                }
        } else {
                if (_route->active()) {
                        controls_ebox.set_name ("BusControlsBaseUnselected");
+                       time_axis_frame.set_name ("BusControlsBaseUnselected");
                        controls_base_selected_name = "BusControlsBaseSelected";
                        controls_base_unselected_name = "BusControlsBaseUnselected";
                } else {
                        controls_ebox.set_name ("BusControlsBaseInactiveUnselected");
+                       time_axis_frame.set_name ("BusControlsBaseInactiveUnselected");
                        controls_base_selected_name = "BusControlsBaseInactiveSelected";
                        controls_base_unselected_name = "BusControlsBaseInactiveUnselected";
                }

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index ca6cd887ced536a29ef43379ea9aa77ecf8a1397..a76f2e07ef9f4b468cf7a6245128ae03182b95e0 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -157,7 +157,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        top_hbox.pack_start (controls_vbox, true, true);
        top_hbox.show ();
 
-       //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
        controls_ebox.add (top_hbox);
        controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK|
                                  Gdk::BUTTON_RELEASE_MASK|