From 88820e7210bad65fbfdf45dd8c98c7240f62e001 Mon Sep 17 00:00:00 2001 From: Adi Oanca Date: Fri, 28 Oct 2005 17:05:46 +0000 Subject: [PATCH] the new clipping code uses the same mechanism for updating frame/bounds, so we don't need some things anymore. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14559 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/View.cpp | 6 +----- src/kits/interface/Window.cpp | 35 +---------------------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp index 4435bdd6a6..4bb6324091 100644 --- a/src/kits/interface/View.cpp +++ b/src/kits/interface/View.cpp @@ -561,11 +561,7 @@ BRect BView::Bounds() const { // do we need to update our bounds? - if ( -#if 1 // 0 to make the new clipping code work -!fState->IsValid(B_VIEW_FRAME_BIT) && -#endif - fOwner) { + if (!fState->IsValid(B_VIEW_FRAME_BIT) && fOwner) { check_lock(); fOwner->fLink->StartMessage(AS_LAYER_GET_COORD); diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp index e33a185d50..64ae18f994 100644 --- a/src/kits/interface/Window.cpp +++ b/src/kits/interface/Window.cpp @@ -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: { @@ -863,40 +863,7 @@ BWindow::DispatchMessage(BMessage *msg, BHandler *target) } break; } -#else - case B_VIEW_MOVED: - { - BPoint where; - msg->FindPoint("where", &where); - - if (target && target != this && dynamic_cast(target)) - { - STRACE(("Calling BView(%s)::FrameMoved( %f, %f )\n", target->Name(), where.x, where.y)); - ((BView*)target)->FrameMoved(where); - } - - break; - } - - case B_VIEW_RESIZED: - { - float newWidth, - newHeight; - BPoint where; - - msg->FindFloat("width", &newWidth); - msg->FindFloat("height", &newHeight); - msg->FindPoint("where", &where); - - if (target && target != this && dynamic_cast(target)){ - STRACE(("Calling BView(%s)::FrameResized( %f, %f )\n", target->Name(), newWidth, newHeight)); - ((BView*)target)->FrameResized(newWidth, newHeight); - } - - break; - } -#endif case _MENUS_DONE_: MenusEnded(); break;