Bring BALMLayout in line with changes to BLayout.

This commit is contained in:
Alex Wilson
2011-10-28 14:16:46 -06:00
parent eee4243d35
commit 17499672a0
2 changed files with 6 additions and 6 deletions
+4 -3
View File
@@ -122,11 +122,12 @@ public:
virtual BSize BasePreferredSize(); virtual BSize BasePreferredSize();
virtual BAlignment BaseAlignment(); virtual BAlignment BaseAlignment();
virtual void InvalidateLayout(bool children = false); protected:
virtual bool ItemAdded(BLayoutItem* item, int32 atIndex); virtual bool ItemAdded(BLayoutItem* item, int32 atIndex);
virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex); virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex);
virtual void DerivedLayoutItems();
virtual void LayoutInvalidated(bool children);
virtual void DoLayout();
private: private:
/*! Add a view without initialize the Area. */ /*! Add a view without initialize the Area. */
+2 -3
View File
@@ -718,9 +718,8 @@ BALMLayout::BaseAlignment()
* Resets minimum/maximum/preferred size. * Resets minimum/maximum/preferred size.
*/ */
void void
BALMLayout::InvalidateLayout(bool children) BALMLayout::LayoutInvalidated(bool children)
{ {
BLayout::InvalidateLayout(children);
fMinSize = kUnsetSize; fMinSize = kUnsetSize;
fMaxSize = kUnsetSize; fMaxSize = kUnsetSize;
fPreferredSize = kUnsetSize; fPreferredSize = kUnsetSize;
@@ -751,7 +750,7 @@ BALMLayout::ItemRemoved(BLayoutItem* item, int32 fromIndex)
* If no layout specification is given, a specification is reverse engineered automatically. * If no layout specification is given, a specification is reverse engineered automatically.
*/ */
void void
BALMLayout::DerivedLayoutItems() BALMLayout::DoLayout()
{ {
_UpdateAreaConstraints(); _UpdateAreaConstraints();