Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small checkin to make the new clipping code work if one desires 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14461 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2005-10-20 18:49:36 +00:00
parent f3bb653937
commit a5cd1aeed0
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kits/interface/View.cpp
View File

@ -561,7 +561,11 @@ BRect
BView::Bounds() const
{
// do we need to update our bounds?
if (!fState->IsValid(B_VIEW_FRAME_BIT) && fOwner) {
if (
#if 1 // 0 to make the new clipping code work
!fState->IsValid(B_VIEW_FRAME_BIT) &&
#endif
fOwner) {
check_lock();
fOwner->fLink->StartMessage(AS_LAYER_GET_COORD);
@ -3961,7 +3965,8 @@ BView::attachView(BView *view)
fOwner->fLink->Attach<int32>(_get_object_token_(view));
fOwner->fLink->AttachString(view->Name());
fOwner->fLink->Attach<BRect>(view->Frame());
// send view's frame. the next line replaces: fOwner->fLink->Attach<BRect>(view->Frame());
fOwner->fLink->Attach<BRect>(view->fBounds.OffsetToCopy(view->fParentOffset));
fOwner->fLink->Attach<uint32>(view->ResizingMode());
fOwner->fLink->Attach<uint32>(view->fEventMask);
fOwner->fLink->Attach<uint32>(view->fEventOptions);

8
src/kits/interface/Window.cpp
View File

@ -811,7 +811,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target)
fLink->Flush();
break;
}
#if 1 // 0 to make the new clipping code work
case B_VIEW_RESIZED:
case B_VIEW_MOVED:
{
@ -826,7 +826,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target)
float width;
float height;
BView *view;
for (int32 i = 0; msg->FindInt32("_token", i, &token) >= B_OK; i++) {
for (int32 i = 0; CurrentMessage() && msg->FindInt32("_token", i, &token) >= B_OK; i++) {
if (token >= 0) {
msg->FindPoint("where", i, &frameLeftTop);
msg->FindFloat("width", i, &width);
@ -863,7 +863,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target)
}
break;
}
/*
#else
case B_VIEW_MOVED:
{
BPoint where;
@ -896,7 +896,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target)
break;
}
*/
#endif
case _MENUS_DONE_:
MenusEnded();
break;