tweak monitor button colors; move buttons to just below panners

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

4 files changed, 15 insertions, 8 deletions

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index 9612d295af..634768e6f6 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -153,15 +153,15 @@ style "monitor_input_button" = "small_button"
         fg[NORMAL] = darker(@@COLPREFIX@_fg)
         fg[PRELIGHT] = darker(@@COLPREFIX@_fg)
         bg[NORMAL] = mix(0.1,@@COLPREFIX@_monitor,darker(@@COLPREFIX@_bg))
-        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_monitor,darker(@@COLPREFIX@_bg))
+        bg[PRELIGHT] = mix(0.1,@@COLPREFIX@_somewhat_bright_indicator,darker(@@COLPREFIX@_bg))
 }
 
 style "monitor_input_button_active" = "small_button"
 {
 	fg[NORMAL] = @@COLPREFIX@_fg
 	fg[PRELIGHT] = @@COLPREFIX@_fg
-	bg[NORMAL] = @@COLPREFIX@_monitor
-	bg[PRELIGHT] = @@COLPREFIX@_monitor
+	bg[NORMAL] = mix (0.8, @@COLPREFIX@_monitor, darker (@@COLPREFIX@_bg))
+	bg[PRELIGHT] = mix (0.8, @@COLPREFIX@_monitor, darker (@@COLPREFIX@_bg))
 }
 
 style "monitor_input_button_alternate" = "small_button"
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index bfdb992674..a0420223ec 100644
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -29,7 +29,7 @@
 #@color isolate #B9ECF2
 #@color mute #FFFA87
 #@color mono #DEC
-#@color monitor #7596DE
+#@color monitor #ED6D0B
 #@color control_text2 #8D2B1B
 #@color control_base #26292D
 #@color control_text #D0D2D5
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index c069151bbe..5163db42b3 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -87,7 +87,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
 	, panners (sess)
 	, button_table (3, 1)
 	, solo_led_table (2, 2)
-	, middle_button_table (2, 2)
+	, top_button_table (1, 2)
+	, middle_button_table (1, 2)
 	, bottom_button_table (1, 2)
 	, meter_point_label (_("pre"))
 	, midi_input_enable_button (0)
@@ -220,8 +221,14 @@ MixerStrip::init ()
         solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
 	solo_led_table.attach (*_safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
         solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
-
         solo_led_table.show ();
+
+	top_button_table.set_homogeneous (true);
+	top_button_table.set_spacings (0);
+	top_button_table.attach (*monitor_input_button, 0, 1, 0, 1);
+        top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
+	top_button_table.show ();
+
 	below_panner_box.set_border_width (2);
 	below_panner_box.set_spacing (2);
         below_panner_box.pack_end (solo_led_table, false, false);
@@ -238,8 +245,6 @@ MixerStrip::init ()
 	middle_button_table.set_spacings (0);
 	middle_button_table.attach (*mute_button, 0, 1, 0, 1);
         middle_button_table.attach (*solo_button, 1, 2, 0, 1);
-	middle_button_table.attach (*monitor_input_button, 0, 1, 1, 2);
-        middle_button_table.attach (*monitor_disk_button, 1, 2, 1, 2);
 
 	bottom_button_table.set_col_spacings (0);
 	bottom_button_table.set_homogeneous (true);
@@ -276,6 +281,7 @@ MixerStrip::init ()
 	global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (processor_box, true, true);
 	global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
+	global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (below_panner_box, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK);
 	global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 14a2853123..b08e1da29c 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -164,6 +164,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	Gtk::Table button_table;
 	Gtk::Table solo_led_table;
 	Gtk::HBox  below_panner_box;
+	Gtk::Table top_button_table;
 	Gtk::Table middle_button_table;
 	Gtk::Table bottom_button_table;