amend 5d0303b - fix editor summary leak

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 39817e464f9ce77382a52b9cc73ce269f845988b..ef09b2289877708a98d39dabf4e976f5abe25a59 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -28,6 +28,7 @@
 #include "ardour/dB.h"
 #include "ardour/session.h"
 
+#include "public_editor.h"
 #include "option_editor.h"
 #include "gui_thread.h"
 #include "i18n.h"
@@ -139,6 +140,18 @@ BoolOption::toggled ()
        _set (_button->get_active ());
 }
 
+RouteDisplayBoolOption::RouteDisplayBoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s)
+       : BoolOption (i, n, g, s)
+{
+}
+
+void
+RouteDisplayBoolOption::toggled ()
+{
+       DisplaySuspender ds;
+       BoolOption::toggled ();
+}
+
 EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s)
        : Option (i, n),
          _get (g),
@@ -254,9 +267,10 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
        , _get (g)
        , _set (s)
 {
-       _db_slider = manage (new HSliderController (&_db_adjustment, 115, 18, false));
+       _db_slider = manage (new HSliderController (&_db_adjustment, 115, 18));
 
        _label.set_text (n + ":");
+       _label.set_alignment (0, 0.5);
        _label.set_name (X_("OptionsLabel"));
 
        _fader_centering_box.pack_start (*_db_slider, true, false);
@@ -466,7 +480,10 @@ DirectoryOption::set_state_from_config ()
 void
 DirectoryOption::add_to_page (OptionEditorPage* p)
 {
-       add_widgets_to_page (p, manage (new Label (_name)), &_file_chooser);
+       Gtk::Label *label = manage (new Label (_name));
+       label->set_alignment (0, 0.5);
+       label->set_name (X_("OptionsLabel"));
+       add_widgets_to_page (p, label, &_file_chooser);
 }
 
 void