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/panner_ui.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/panner_ui.cc')
-rw-r--r-- | gtk2_ardour/panner_ui.cc | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 72cd24bcce..d65d02f92e 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -73,8 +73,7 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s) //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2); pan_bar_packer.set_size_request (-1, 61); - panning_viewport.set_size_request (64, 61); - + panning_viewport.set_size_request (-1, 61); panning_viewport.set_name (X_("BaseFrame")); ARDOUR_UI::instance()->tooltips().set_tip (panning_link_button, @@ -137,7 +136,7 @@ PannerUI::PannerUI (boost::shared_ptr<IO> io, Session& s) pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK); pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK); - pack_start (pan_vbox, true, false); + pack_start (pan_vbox, true, true); panner = 0; @@ -215,23 +214,9 @@ PannerUI::set_width (Width w) { switch (w) { case Wide: - panning_viewport.set_size_request (64, 61); - if (panner) { - panner->set_size_request (63, 61); - } - for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - (*i)->set_size_request (63, pan_bar_height); - } panning_link_button.set_label (_("link")); break; case Narrow: - panning_viewport.set_size_request (34, 61); - if (panner) { - panner->set_size_request (33, 61); - } - for (vector<PannerBar*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) { - (*i)->set_size_request (33, pan_bar_height); - } panning_link_button.set_label (_("L")); break; } @@ -344,16 +329,9 @@ PannerUI::setup_pan () bc->event_widget().signal_button_release_event().connect (bind (mem_fun(*this, &PannerUI::pan_button_event), (uint32_t) asz)); - pan_bars.push_back (bc); - switch (_width) { - case Wide: - bc->set_size_request (63, pan_bar_height); - break; - case Narrow: - bc->set_size_request (33, pan_bar_height); - break; - } + bc->set_size_request (-1, pan_bar_height); + pan_bars.push_back (bc); pan_bar_packer.pack_start (*bc, false, false); } @@ -370,26 +348,15 @@ PannerUI::setup_pan () } else { - int w = 0; - - switch (_width) { - case Wide: - w = 63; - break; - case Narrow: - w = 33; - break; - } - if (panner == 0) { - panner = new Panner2d (_io->panner(), w, 61); + panner = new Panner2d (_io->panner(), 61); panner->set_name ("MixerPanZone"); panner->show (); } update_pan_sensitive (); panner->reset (_io->n_inputs()); - panner->set_size_request (w, 61); + panner->set_size_request (-1, 61); /* and finally, add it to the panner frame */ |