diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2005-12-18 13:19:02 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2005-12-18 13:19:02 +0000 |
| commit | f42c69103bce82b563f373c1604b87903288f9ae (patch) | |
| tree | a599076ae698f1e07dda6f55072fee2b099470d8 /gtk2_ardour/editor_mixer.cc | |
| parent | 46627353ad00e2a462b1fff4c8074218bd7346aa (diff) | |
Don't resize the editor_mixer when changing tracks, gcc 4.1 fix, reorder editor notepad slightly, don't use show () when constructing a mixer strip (it's shown later always)
git-svn-id: svn://localhost/trunk/ardour2@197 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
| -rw-r--r-- | gtk2_ardour/editor_mixer.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 70df0b1bf9..ec1511f2a2 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -95,16 +95,16 @@ Editor::show_editor_mixer (bool yn) current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden)); current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed)); current_mixer_strip->set_width (editor_mixer_strip_width); - current_mixer_strip->show_all (); - global_hpacker.pack_start (*current_mixer_strip, false, false); + global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK ); global_hpacker.reorder_child (*current_mixer_strip, 0); + current_mixer_strip->show_all (); } } else { if (current_mixer_strip) { - editor_mixer_strip_width = current_mixer_strip->get_width (); + editor_mixer_strip_width = current_mixer_strip->get_width (); if (current_mixer_strip->get_parent() != 0) { global_hpacker.remove (*current_mixer_strip); } @@ -133,7 +133,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view) if (current_mixer_strip->get_parent()) { show = true; } - delete current_mixer_strip; current_mixer_strip = 0; } |