i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minimize the effect invisible items have on a BALMLayout.

Browse Source 
There seems to still be some effect on positioning, but invisible items
no longer constrain the layout.
This commit is contained in:
Alex Wilson
2012-05-03 08:45:16 +12:00
parent af6ddb01df
commit 6169a6e3d1
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/alm/Area.cpp
+15
View File
@@ -571,6 +571,9 @@ Area::_DoLayout(const BPoint& offset)
if (!fLeft) if (!fLeft)
return; return;
if (!fLayoutItem->IsVisible())
fLayoutItem->AlignInFrame(BRect(0, 0, -1, -1));
BRect areaFrame(Frame()); BRect areaFrame(Frame());
areaFrame.left += LeftInset(); areaFrame.left += LeftInset();
areaFrame.right -= RightInset(); areaFrame.right -= RightInset();
@@ -584,6 +587,12 @@ Area::_DoLayout(const BPoint& offset)
void void
Area::_UpdateMinSizeConstraint(BSize min) Area::_UpdateMinSizeConstraint(BSize min)
{ {
if (!fLayoutItem->IsVisible()) {
fMinContentHeight->SetRightSide(-1);
fMinContentWidth->SetRightSide(-1);
return;
}
float width = 0.; float width = 0.;
float height = 0.; float height = 0.;
if (min.width > 0) if (min.width > 0)
@@ -599,6 +608,12 @@ Area::_UpdateMinSizeConstraint(BSize min)
void void
Area::_UpdateMaxSizeConstraint(BSize max) Area::_UpdateMaxSizeConstraint(BSize max)
{ {
if (!fLayoutItem->IsVisible()) {
fMaxContentHeight->SetRightSide(B_SIZE_UNLIMITED);
fMaxContentWidth->SetRightSide(B_SIZE_UNLIMITED);
return;
}
max.width += LeftInset() + RightInset(); max.width += LeftInset() + RightInset();
max.height += TopInset() + BottomInset(); max.height += TopInset() + BottomInset();