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

Bring BALMLayout in line with changes to BLayout.

This commit is contained in:
Alex Wilson 2011-10-22 14:54:43 -06:00
parent eee4243d35
commit 17499672a0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/libs/alm/ALMLayout.h
View File

@ -122,11 +122,12 @@ public:
virtual BSize BasePreferredSize();
virtual BAlignment BaseAlignment();
virtual void InvalidateLayout(bool children = false);
protected:
virtual bool ItemAdded(BLayoutItem* item, int32 atIndex);
virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex);
virtual void DerivedLayoutItems();
virtual void LayoutInvalidated(bool children);
virtual void DoLayout();
private:
/*! Add a view without initialize the Area. */

5
src/libs/alm/ALMLayout.cpp
View File

@ -718,9 +718,8 @@ BALMLayout::BaseAlignment()
* Resets minimum/maximum/preferred size.
*/
void
BALMLayout::InvalidateLayout(bool children)
BALMLayout::LayoutInvalidated(bool children)
{
BLayout::InvalidateLayout(children);
fMinSize = kUnsetSize;
fMaxSize = 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.
*/
void
BALMLayout::DerivedLayoutItems()
BALMLayout::DoLayout()
{
_UpdateAreaConstraints();