Speaking about bugs... removing views is now actually working again.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16441 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -3380,10 +3380,10 @@ BView::RemoveSelf()
|
|||||||
if (!fParent || !fParent->_RemoveChildFromList(this))
|
if (!fParent || !fParent->_RemoveChildFromList(this))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (owner != NULL && fTopLevelView) {
|
if (owner != NULL && !fTopLevelView) {
|
||||||
// the top level view is deleted by the app_server automatically
|
// the top level view is deleted by the app_server automatically
|
||||||
owner->fLink->StartMessage(AS_LAYER_DELETE);
|
owner->fLink->StartMessage(AS_LAYER_DELETE);
|
||||||
owner->fLink->Attach<int32>(_get_object_token_(fParent));
|
owner->fLink->Attach<int32>(_get_object_token_(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
STRACE(("DONE: BView(%s)::RemoveSelf()\n", Name()));
|
STRACE(("DONE: BView(%s)::RemoveSelf()\n", Name()));
|
||||||
@@ -4148,7 +4148,7 @@ BView::_Detach()
|
|||||||
AllDetached();
|
AllDetached();
|
||||||
|
|
||||||
if (fOwner) {
|
if (fOwner) {
|
||||||
check_lock();
|
check_lock_no_pick();
|
||||||
|
|
||||||
// make sure our owner doesn't need us anymore
|
// make sure our owner doesn't need us anymore
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user