diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 17:49:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 17:49:55 +0000 |
| commit | b6f75104e3625fdf38b6b8eeba1242845d32c713 (patch) | |
| tree | 172560d7ed1400fc3272b58a653f079a28d47d47 | |
| parent | acebbd9029fac8be465d1c9d4702b3014ef78a78 (diff) | |
edit group visibility maintained, patch from nickm (#2796)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5708 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_edit_groups.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/route_group.cc | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc index 3b21caca6c..3383e6bfe9 100644 --- a/gtk2_ardour/editor_edit_groups.cc +++ b/gtk2_ardour/editor_edit_groups.cc @@ -229,7 +229,9 @@ Editor::edit_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeM bool active = (*iter)[group_columns.is_active]; group->set_active (active, this); - + + bool visible = (*iter)[group_columns.is_visible]; + group->set_hidden (!visible, this); string name = (*iter)[group_columns.text]; @@ -246,7 +248,7 @@ Editor::add_edit_group (RouteGroup* group) TreeModel::Row row = *(group_model->append()); row[group_columns.is_active] = group->is_active(); - row[group_columns.is_visible] = false; + row[group_columns.is_visible] = !group->is_hidden(); in_edit_group_row_change = true; diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index 13b90474cc..fbf118ed66 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -188,14 +188,8 @@ RouteGroup::set_hidden (bool yn, void *src) } if (yn) { _flags = Flag (_flags | Hidden); - if (Config->get_hiding_groups_deactivates_groups()) { - _flags = Flag (_flags & ~Active); - } } else { _flags = Flag (_flags & ~Hidden); - if (Config->get_hiding_groups_deactivates_groups()) { - _flags = Flag (_flags | Active); - } } _session.set_dirty (); FlagsChanged (src); /* EMIT SIGNAL */ |