diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 17:22:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-02-27 17:22:47 +0000 |
| commit | e1957a31666ad1a23fa0df3f32e2d6910a3abe64 (patch) | |
| tree | d63acb69d3f91a8e9896670976e3a7890ceb81e9 /gtk2_ardour/mixer_strip.cc | |
| parent | ad55d36c560ddb48b50343e334802b9e051d9992 (diff) | |
fix #1394 - The 'narrow strip' option in the mixer does not take extra width into account; involved some nice cleanup of width handling in mixer strips etc.
git-svn-id: svn://localhost/ardour2/trunk@1526 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 5c93882c6d..70e0a6aa18 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -18,6 +18,7 @@ */ #include <cmath> +#include <algorithm> #include <sigc++/bind.h> @@ -62,6 +63,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +using namespace std; int MixerStrip::scrollbar_height = 0; @@ -439,7 +441,6 @@ MixerStrip::set_width (Width w) break; case Narrow: - set_size_request (50, -1); xml_node->add_property ("strip_width", "narrow"); if (rec_enable_button) { @@ -461,6 +462,7 @@ MixerStrip::set_width (Width w) ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style())); ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state())); Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); + set_size_request (max (50, gpm.get_gm_width()), -1); break; } |