remove pixel based Button LED diameter setting

Diameter is calculated depending on font-scaling.
Besides, all explicit calls simply set the default
value, anyway. If some API is needed in the future,
it should set the diameter in [em].

5 files changed, 22 insertions, 44 deletions

diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index cf0d6798a2..97b920152b 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -536,16 +536,6 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 }
 
 void
-ArdourButton::set_diameter (float d)
-{
-	_diameter = (d*2) + 5.0;
-
-	if (is_realized()) {
-		queue_resize ();
-	}
-}
-
-void
 ArdourButton::set_corner_radius (float r)
 {
 	_corner_radius = r;
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 107f5da618..c2b20c3ba9 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -72,7 +72,6 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	void add_elements (Element);
 
 	void set_corner_radius (float);
-	void set_diameter (float);
 
 	void set_text (const std::string&);
 	const std::string& get_text () {return _text;}
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3585783ce9..285e3e9876 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -178,25 +178,20 @@ MixerStrip::init ()
 	
 	hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
 
-	monitor_input_button->set_diameter (3);
-	monitor_disk_button->set_diameter (3);
-
-        solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_isolated_led->show ();
-        solo_isolated_led->set_diameter (3);
-        solo_isolated_led->set_no_show_all (true);
-        solo_isolated_led->set_name (X_("solo isolate"));
-        solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
+	solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+	solo_isolated_led->show ();
+	solo_isolated_led->set_no_show_all (true);
+	solo_isolated_led->set_name (X_("solo isolate"));
+	solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
 	UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
 
-        solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
-        solo_safe_led->show ();
-        solo_safe_led->set_diameter (3);
-        solo_safe_led->set_no_show_all (true);
-        solo_safe_led->set_name (X_("solo safe"));
-        solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
-        solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
+	solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+	solo_safe_led->show ();
+	solo_safe_led->set_no_show_all (true);
+	solo_safe_led->set_name (X_("solo safe"));
+	solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+	solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
 	UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
 
 	solo_safe_led->set_text (_("Lock"));
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index b31eeea295..6d2fdbb677 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -497,23 +497,18 @@ MonitorSection::set_session (Session* s)
 
 MonitorSection::ChannelButtonSet::ChannelButtonSet ()
 {
-	cut.set_diameter (3);
-	dim.set_diameter (3);
-	solo.set_diameter (3);
-	invert.set_diameter (3);
-
-        cut.set_name (X_("monitor section cut"));
-        dim.set_name (X_("monitor section dim"));
-        solo.set_name (X_("monitor section solo"));
-        invert.set_name (X_("monitor section invert"));
-
-        cut.unset_flags (Gtk::CAN_FOCUS);
-        dim.unset_flags (Gtk::CAN_FOCUS);
-        solo.unset_flags (Gtk::CAN_FOCUS);
-        invert.unset_flags (Gtk::CAN_FOCUS);
+	cut.set_name (X_("monitor section cut"));
+	dim.set_name (X_("monitor section dim"));
+	solo.set_name (X_("monitor section solo"));
+	invert.set_name (X_("monitor section invert"));
+
+	cut.unset_flags (Gtk::CAN_FOCUS);
+	dim.unset_flags (Gtk::CAN_FOCUS);
+	solo.unset_flags (Gtk::CAN_FOCUS);
+	invert.unset_flags (Gtk::CAN_FOCUS);
 }
 
-void
+	void
 MonitorSection::populate_buttons ()
 {
         if (!_monitor) {
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 27d020569d..569566d560 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -113,7 +113,6 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
 {
 	_vbox.show ();
 	
-	_button.set_diameter (3);
 	_button.set_distinct_led_click (true);
 	_button.set_fallthrough_to_parent(true);
 	_button.set_led_left (true);