In BeOS, BView::Bounds() does the owner lock check. In Haiku, it does now
too. Removed the check in Frame() accordingly, because that uses Bounds(). Removed some code left overs. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26501 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -621,24 +621,8 @@ BView::~BView()
|
|||||||
BRect
|
BRect
|
||||||
BView::Bounds() const
|
BView::Bounds() const
|
||||||
{
|
{
|
||||||
// do we need to update our bounds?
|
_CheckLock();
|
||||||
|
|
||||||
// TODO: why should our frame be out of sync ever?
|
|
||||||
/*
|
|
||||||
if (!fState->IsValid(B_VIEW_FRAME_BIT) && fOwner) {
|
|
||||||
_CheckLockAndSwitchCurrent();
|
|
||||||
|
|
||||||
fOwner->fLink->StartMessage(AS_VIEW_GET_COORD);
|
|
||||||
|
|
||||||
int32 code;
|
|
||||||
if (fOwner->fLink->FlushWithReply(code) == B_OK
|
|
||||||
&& code == B_OK) {
|
|
||||||
fOwner->fLink->Read<BPoint>(const_cast<BPoint *>(&fParentOffset));
|
|
||||||
fOwner->fLink->Read<BRect>(const_cast<BRect *>(&fBounds));
|
|
||||||
fState->valid_flags |= B_VIEW_FRAME_BIT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
if (fIsPrinting)
|
if (fIsPrinting)
|
||||||
return fState->print_rect;
|
return fState->print_rect;
|
||||||
|
|
||||||
@@ -906,8 +890,6 @@ BView::SetFlags(uint32 flags)
|
|||||||
BRect
|
BRect
|
||||||
BView::Frame() const
|
BView::Frame() const
|
||||||
{
|
{
|
||||||
_CheckLock();
|
|
||||||
|
|
||||||
return Bounds().OffsetToCopy(fParentOffset.x, fParentOffset.y);
|
return Bounds().OffsetToCopy(fParentOffset.x, fParentOffset.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user