diff options
author | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
commit | 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce (patch) | |
tree | 1fb1a5e7eef6684c0a5bb49be492612c71796fc4 /gtk2_ardour/mixer_ui.cc | |
parent | 1b657585572298d1a69a7b43e611f59b7e185df3 (diff) |
Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index f7a1d48a50..a7bf2a3f97 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -62,7 +62,7 @@ Mixer_UI::Mixer_UI () : Window (Gtk::WINDOW_TOPLEVEL) { session = 0; - Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide; + _strip_width = Config->get_default_narrow_ms() ? Narrow : Wide; track_menu = 0; mix_group_context_menu = 0; no_track_list_redisplay = false; @@ -200,10 +200,6 @@ Mixer_UI::Mixer_UI () list_hpane.signal_size_allocate().connect (bind (mem_fun(*this, &Mixer_UI::pane_allocation_handler), static_cast<Gtk::Paned*> (&list_hpane))); - - rhs_pane1.set_data ("collapse-direction", (gpointer) 0); - list_hpane.set_data ("collapse-direction", (gpointer) 1); - global_vpacker.pack_start (list_hpane, true, true); add (global_vpacker); |