diff options
author | David Robillard <d@drobilla.net> | 2007-04-29 17:23:11 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-04-29 17:23:11 +0000 |
commit | b3fe7cfc892f7d5978ad14eb81e9305fa9c14d13 (patch) | |
tree | 4c6617c0397fb1ad3bef1f5fced35fb64b022ccb /gtk2_ardour/mixer_ui.cc | |
parent | 490e18d80a22dda07bdf88dd440f7100897822de (diff) |
Merged with trunk R1761
git-svn-id: svn://localhost/ardour2/branches/midi@1762 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index cbd9cfe083..766db2938f 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -244,7 +244,7 @@ Mixer_UI::show_window () for (ri = rows.begin(); ri != rows.end(); ++ri) { ms = (*ri)[track_columns.strip]; - ms->set_width (ms->get_width()); + ms->set_width (ms->get_width(), ms->width_owner()); } _visible = true; } @@ -274,7 +274,10 @@ Mixer_UI::add_strip (Session::RouteList& routes) strip = new MixerStrip (*this, *session, route); strips.push_back (strip); - strip->set_width (_strip_width); + if (strip->width_owner() != strip) { + strip->set_width (_strip_width, this); + } + show_strip (strip); no_track_list_redisplay = true; @@ -1040,7 +1043,7 @@ Mixer_UI::set_strip_width (Width w) _strip_width = w; for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) { - (*i)->set_width (w); + (*i)->set_width (w, this); } } |