From 0abcce07353cb32aa30c78952ae8d9bf99882e78 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 28 Oct 2014 10:12:01 -0400
Subject: Revert "change the peak display widget from Gtkmm2ext::FocusEntry to
 ArdourButton, since it is absolutely not editable."

This reverts commit 58f7d02bf21776f7537ac16ae41646859dbca0b1.

Conflicts:
	gtk2_ardour/default_ui_config.in
	gtk2_ardour/gain_meter.cc
---
 gtk2_ardour/canvas_vars.h        |  1 -
 gtk2_ardour/default_ui_config.in |  6 ------
 gtk2_ardour/gain_meter.cc        | 12 ++++++------
 gtk2_ardour/gain_meter.h         |  3 ++-
 4 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 34fc3adc3a..b7eb85c37a 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -235,7 +235,6 @@ BUTTON_VARS(MixerStripNameButton, "mixer strip name button")
 BUTTON_VARS(MidiInputButton, "midi input button")
 BUTTON_VARS(LockButton, "lock button")
 BUTTON_VARS(GenericButton, "generic button")
-BUTTON_VARS(PeakDisplayButton, "peak display")
 
 #define CLOCK_VARS(root,name) \
 	CANVAS_VARIABLE(root ## Background, name ": background") \
diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in
index c7e1233b50..126eb125c0 100644
--- a/gtk2_ardour/default_ui_config.in
+++ b/gtk2_ardour/default_ui_config.in
@@ -285,12 +285,6 @@
     <Option name="monitor solo exclusive: led active" value="ffa500ff"/>
     <Option name="monitor solo exclusive: text" value="c7c7d8ff"/>
     <Option name="monitor solo exclusive: text active" value="c8c8d9ff"/>
-    <Option name="peak display: fill" value="171717ff"/>
-    <Option name="peak display: fill active" value="e21b1bff"/>
-    <Option name="peak display: led" value="00000000"/>
-    <Option name="peak display: led active" value="00000000"/>
-    <Option name="peak display: text" value="ffffffff"/>
-    <Option name="peak display: text active" value="000000ff"/>
     <Option name="rude solo: fill" value="684d4dff"/>
     <Option name="rude solo: fill active" value="e21b1bff"/>
     <Option name="rude solo: led" value="00000000"/>
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b0ed45df85..ff91f5a74a 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -101,11 +101,12 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int
 	gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false);
 	gain_display.set_alignment(0.5);
 
-	peak_display.set_name ("peak display");
-	peak_display.set_layout_font (ARDOUR_UI::config()->get_SmallFont());
+	peak_display.set_name ("MixerStripPeakDisplay");
+	set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
 	max_peak = minus_infinity();
 	peak_display.set_text (_("-inf"));
-	peak_display.set_alignment (0.5, 0.5);
+	peak_display.unset_flags (Gtk::CAN_FOCUS);
+	peak_display.set_alignment(0.5);
 
 	gain_automation_style_button.set_name ("mixer strip button");
 	gain_automation_state_button.set_name ("mixer strip button");
@@ -364,7 +365,7 @@ GainMeterBase::reset_peak_display ()
 	level_meter->clear_meters();
 	max_peak = -INFINITY;
 	peak_display.set_text (_("-inf"));
-	peak_display.set_active (false);
+	peak_display.set_name ("MixerStripPeakDisplay");
 }
 
 void
@@ -865,9 +866,8 @@ GainMeterBase::update_meters()
 			peak_display.set_text (buf);
 		}
 	}
-
 	if (mpeak >= Config->get_meter_peak()) {
-		peak_display.set_active (true);
+		peak_display.set_name ("MixerStripPeakDisplayPeak");
 	}
 }
 
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index a12779a19d..0125c66b11 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -113,7 +113,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
 	Gtkmm2ext::SliderController *gain_slider;
 	Gtk::Adjustment              gain_adjustment;
 	Gtkmm2ext::FocusEntry        gain_display;
-	ArdourButton                 peak_display;
+	Gtkmm2ext::FocusEntry        peak_display;
+//	Gtk::Button                  peak_display;
 	Gtk::DrawingArea             meter_metric_area;
 	Gtk::DrawingArea             meter_ticks1_area;
 	Gtk::DrawingArea             meter_ticks2_area;
-- 
cgit v1.2.3