diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-21 13:10:27 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-21 15:35:20 -0400 |
| commit | fca81c9a6a591b6f94223454a981d919c9ad51a5 (patch) | |
| tree | 5b063277dfe059ba6e31ae1f7dc4f8c384541730 /libs/canvas/item.cc | |
| parent | fee8de97876f4f1162dc2047b80e2728c0c72044 (diff) | |
add Group::clear(), do not clear _canvas member of Item when unparented (only the parent is changed)
Diffstat (limited to 'libs/canvas/item.cc')
| -rw-r--r-- | libs/canvas/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc index f5aa39d20d..786c2f81cd 100644 --- a/libs/canvas/item.cc +++ b/libs/canvas/item.cc @@ -236,13 +236,14 @@ Item::parent_to_item (ArdourCanvas::Rect const & d) const void Item::unparent () { - _canvas = 0; _parent = 0; } void Item::reparent (Group* new_parent) { + assert (_canvas == _parent->canvas ()); + if (_parent) { _parent->remove (this); } @@ -250,7 +251,6 @@ Item::reparent (Group* new_parent) assert (new_parent); _parent = new_parent; - _canvas = _parent->canvas (); _parent->add (this); } |