substantive changes to pixfaders and derived classes. now fully dynamically sizable and have an added texture that currently just emulates the ardour2 belt pattern. mild color changes, not finalized yet.

git-svn-id: svn://localhost/ardour2/branches/3.0@13830 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 19 insertions, 18 deletions

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index 271ee2ec0a..38b2213bd7 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -68,8 +68,13 @@ style "small_red_active_and_selected_button" = "small_button"
 
 style "gain_fader"
 {
-        bg[NORMAL] = shade (0.7, @@COLPREFIX@_lightest)
-	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_lightest)
+        bg[NORMAL] = shade (0.7, @@COLPREFIX@_bg)
+	bg[ACTIVE] = shade (0.705, @@COLPREFIX@_bg)
+	bg[INSENSITIVE] = shade (0.705, @@COLPREFIX@_bg)
+
+        fg[INSENSITIVE] = shade (0.7, @@COLPREFIX@_bright_color)
+        fg[NORMAL] = shade (0.7, @@COLPREFIX@_bright_color)
+	fg[ACTIVE] = shade (0.705, @@COLPREFIX@_bright_color)
 }
 
 #MSR and related buttons
diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index 13c3b87e53..2abe10affe 100644
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -177,9 +177,10 @@ widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
 widget "*MidiTrackControlsBaseUnselected" style:highest "midi_track_base"
 widget "*AudioTrackFader" style:highest "gain_fader"
+widget "*MidiTrackFader" style:highest "gain_fader"
+widget "*AudioBusFader" style:highest "gain_fader"
 
 widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
-widget "*AudioBusFader" style:highest "gain_fader"
 widget "*TrackSeparator" style:highest "track_separator"
 widget "*TrackEditIndicator0*" style:highest "edit_group_0"
 widget "*TrackEditIndicator1*" style:highest "edit_group_1"
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 9436596afa..a405f074ae 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -62,7 +62,7 @@ sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays;
 
 GainMeter::MetricPatterns GainMeter::metric_patterns;
 
-GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length)
+GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth)
 	: gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1)
 	, gain_automation_style_button ("")
 	, gain_automation_state_button ("")
@@ -81,9 +81,9 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length)
 	_width = Wide;
 
 	if (horizontal) {
-		gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, false));
+		gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false));
 	} else {
-		gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, false));
+		gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false));
 	}
 
 	level_meter = new LevelMeter(_session);
@@ -500,10 +500,7 @@ GainMeterBase::set_meter_strip_name (const char * name)
 void
 GainMeterBase::set_fader_name (const char * name)
 {
-        uint32_t rgb_active = rgba_from_style (name, 0xff, 0, 0xff, 0, "bg", STATE_ACTIVE, false);
-        uint32_t rgb_normal = rgba_from_style (name, 0xff, 0xff, 0, 0, "bg", STATE_NORMAL, false);
-
-	gain_slider->set_border_colors (rgb_normal, rgb_active);
+	gain_slider->set_name (name);
 }
 
 void
@@ -511,7 +508,6 @@ GainMeterBase::update_gain_sensitive ()
 {
 	bool x = !(_amp->gain_control()->alist()->automation_state() & Play);
 	static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
-	gain_slider->create_patterns();
 }
 
 static MeterPoint
@@ -854,7 +850,7 @@ GainMeterBase::on_theme_changed()
 }
 
 GainMeter::GainMeter (Session* s, int fader_length)
-	: GainMeterBase (s, false, fader_length)
+	: GainMeterBase (s, false, fader_length, 24)
 	, gain_display_box(true, 0)
 	, hbox(true, 2)
 {
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index 116a0e7dfe..cec844184a 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -67,7 +67,7 @@ namespace Gtk {
 class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 {
   public:
-        GainMeterBase (ARDOUR::Session*, bool horizontal, int);
+        GainMeterBase (ARDOUR::Session*, bool horizontal, int, int);
 	virtual ~GainMeterBase ();
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
@@ -200,7 +200,7 @@ private:
 class GainMeter : public GainMeterBase, public Gtk::VBox
 {
   public:
-	GainMeter (ARDOUR::Session*, int);
+         GainMeter (ARDOUR::Session*, int);
 	~GainMeter () {}
 
 	virtual void set_controls (boost::shared_ptr<ARDOUR::Route> route,
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 2cf051baf2..58c3e6a85b 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -394,7 +394,7 @@ ProcessorEntry::toggle_control_visibility (Control* c)
 ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string const & n)
 	: _control (c)
 	, _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
-	, _slider (&_adjustment, 0, false)
+	, _slider (&_adjustment, 0, 13, false)
 	, _slider_persistant_tooltip (&_slider)
 	, _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
 	, _ignore_ui_adjustment (false)
@@ -417,7 +417,6 @@ ProcessorEntry::Control::Control (boost::shared_ptr<AutomationControl> c, string
 	} else {
 		
 		_slider.set_name ("PluginSlider");
-		_slider.set_size_request (-1, 13);
 		_slider.set_text (_name);
 
 //		box.pack_start (_label);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a882dd0965..7342269026 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -102,7 +102,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, Canvas& c
 	, playlist_action_menu (0)
 	, mode_menu (0)
 	, color_mode_menu (0)
-	, gm (sess, true, 125)
+	, gm (sess, true, 125, 18)
 	, _ignore_set_layer_display (false)
 {
 }
@@ -194,7 +194,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 //	pad->pack_start (gm.get_gain_slider(), false, false);
 //	pad->pack_start (*manage (new Gtk::Label), true, true);
 //	pad->show_all ();
-	controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
+	controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
 
 	ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
 	ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));