diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-06-21 16:58:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-06-21 16:58:57 +0000 |
| commit | 7a29763ba71cd9f1ed01ec50aeef80c2756739d3 (patch) | |
| tree | 23a654e6d187aaef2483b259d22f540bcbf77033 /gtk2_ardour | |
| parent | 19dd9c529cc9d8db47627274910d849d87bb160a (diff) | |
Fix glitch in group tabs when hiding groups.
git-svn-id: svn://localhost/ardour2/branches/3.0@5234 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_group_tabs.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index d0e58db47a..a79aa45b28 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -68,10 +68,10 @@ MixerGroupTabs::render (cairo_t* cr) int32_t x = 0; for (list<MixerStrip*>::iterator i = _mixer->strips.begin(); i != _mixer->strips.end(); ++i) { - if ((*i)->route()->is_master() || (*i)->route()->is_control()) { + if ((*i)->route()->is_master() || (*i)->route()->is_control() || !(*i)->marked_for_display()) { continue; } - + RouteGroup* g = (*i)->mix_group (); if (g != curr_group) { diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 42fa7d1054..6f9750a32b 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -758,6 +758,8 @@ Mixer_UI::redisplay_track_list () } else { + strip->set_marked_for_display (false); + if (strip->route()->is_master() || strip->route()->is_control()) { /* do nothing, these cannot be hidden */ } else { @@ -1261,7 +1263,6 @@ Mixer_UI::mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::Tree void Mixer_UI::add_mix_group (RouteGroup* group) - { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::add_mix_group), group)); bool focus = false; |