diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-16 19:34:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-16 19:34:57 +0000 |
| commit | 0d035c70f2f1bcbd3d0316a3bbde833076c6d656 (patch) | |
| tree | 3af28e16e6e474ce2346f1b30afcc093b78affc6 /gtk2_ardour/mixer_strip.cc | |
| parent | 2bf3ed423f7aecdaabf5fbb078d9e2f20d26880c (diff) | |
small changes to the mixer strip from thorwil
git-svn-id: svn://localhost/ardour2/trunk@1135 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index f79ac9bb93..962683ebea 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -64,6 +64,8 @@ using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +int MixerStrip::scrollbar_height = 0; + #ifdef VARISPEED_IN_MIXER_STRIP static void speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg) @@ -110,7 +112,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt comment_window = 0; comment_area = 0; - width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm"))))); + width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width"))))); hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); input_label.set_text (_("Input")); @@ -260,6 +262,21 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK); + if (route()->master() || route()->control()) { + + if (scrollbar_height == 0) { + HScrollbar scrollbar; + Gtk::Requisition requisition; + scrollbar.size_request (requisition); + scrollbar_height = requisition.height; + cerr << "scrollbar height = " << scrollbar_height << endl; + } + + EventBox* spacer = manage (new EventBox); + spacer->set_size_request (-1, scrollbar_height); + global_vpacker.pack_start (*spacer, false, false); + } + global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_name ("BaseFrame"); |