From 8b52747974b85d4377376fe51ef925ebedbf51d9 Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Mon, 16 Jan 2012 14:13:05 +1300 Subject: [PATCH] In Area, remove unused ItemFrame() method. Also modify Frame() method to return a rect with rounded coordinates. --- headers/libs/alm/Area.h | 1 - src/libs/alm/Area.cpp | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/headers/libs/alm/Area.h b/headers/libs/alm/Area.h index 10227713a2..88c331c7cf 100644 --- a/headers/libs/alm/Area.h +++ b/headers/libs/alm/Area.h @@ -107,7 +107,6 @@ public: void InvalidateSizeConstraints(); BRect Frame() const; - BRect ItemFrame() const; private: Area(BLayoutItem* item); diff --git a/src/libs/alm/Area.cpp b/src/libs/alm/Area.cpp index 664ddfe4be..5233371bd9 100644 --- a/src/libs/alm/Area.cpp +++ b/src/libs/alm/Area.cpp @@ -491,15 +491,8 @@ Area::InvalidateSizeConstraints() BRect Area::Frame() const { - return BRect(fLeft->Value(), fTop->Value(), fRight->Value(), - fBottom->Value()); -} - - -BRect -Area::ItemFrame() const -{ - return fLayoutItem->Frame(); + return BRect(round(fLeft->Value()), round(fTop->Value()), + round(fRight->Value()), round(fBottom->Value())); } @@ -615,8 +608,7 @@ Area::_DoLayout() if (!fLeft) return; - BRect areaFrame(round(fLeft->Value()), round(fTop->Value()), - round(fRight->Value()), round(fBottom->Value())); + BRect areaFrame(Frame()); areaFrame.left += LeftInset(); areaFrame.right -= RightInset(); areaFrame.top += TopInset();