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

Handle layout items like glue correct. Update the preferred size constraint if a tab has been replaced. Fix coding style (thanks Axel). 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38804 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2010-09-24 03:22:37 +00:00
parent 23395e2082
commit 030345058e
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/libs/alm/Area.cpp
View File

@ -86,7 +86,7 @@ Area::SetLeft(XTab* left)
fColumn = NULL; fColumn = NULL;
fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight); fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
fPreferredContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
if (fMaxContentWidth != NULL) if (fMaxContentWidth != NULL)
fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight); fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
@ -107,7 +107,7 @@ Area::SetRight(XTab* right)
fColumn = NULL; fColumn = NULL;
fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight); fMinContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
fPreferredContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
if (fMaxContentWidth != NULL) if (fMaxContentWidth != NULL)
fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight); fMaxContentWidth->SetLeftSide(-1.0, fLeft, 1.0, fRight);
@ -126,7 +126,7 @@ Area::SetTop(YTab* top)
fRow = NULL; fRow = NULL;
fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom); fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
fPreferredContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
if (fMaxContentHeight != NULL) if (fMaxContentHeight != NULL)
fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom); fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
@ -145,7 +145,7 @@ Area::SetBottom(YTab* bottom)
fRow = NULL; fRow = NULL;
fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom); fMinContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
fPreferredContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
if (fMaxContentHeight != NULL) if (fMaxContentHeight != NULL)
fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom); fMaxContentHeight->SetLeftSide(-1.0, fTop, 1.0, fBottom);
@ -266,8 +266,7 @@ Area::SetContentAspectRatio(double ratio)
if (fContentAspectRatio <= 0) { if (fContentAspectRatio <= 0) {
delete fContentAspectRatioC; delete fContentAspectRatioC;
fContentAspectRatioC = NULL; fContentAspectRatioC = NULL;
} } else if (fContentAspectRatioC == NULL) {
else if (fContentAspectRatioC == NULL) {
fContentAspectRatioC = fLS->AddConstraint(-1.0, fLeft, 1.0, fRight, fContentAspectRatioC = fLS->AddConstraint(-1.0, fLeft, 1.0, fRight,
ratio, fTop, -ratio, fBottom, OperatorType(EQ), 0.0); ratio, fTop, -ratio, fBottom, OperatorType(EQ), 0.0);
fConstraints.AddItem(fContentAspectRatioC); fConstraints.AddItem(fContentAspectRatioC);
@ -485,8 +484,8 @@ Area::Area(BLayoutItem* item)
fRow(NULL), fRow(NULL),
fColumn(NULL), fColumn(NULL),
fShrinkPenalties(2, 2), fShrinkPenalties(5, 5),
fGrowPenalties(1, 1), fGrowPenalties(5, 5),
fMinContentWidth(NULL), fMinContentWidth(NULL),
fMaxContentWidth(NULL), fMaxContentWidth(NULL),
@ -517,13 +516,23 @@ Area::_Init(LinearSpec* ls, XTab* left, YTab* top, XTab* right, YTab* bottom)
// adds the two essential constraints of the area that make sure that the // adds the two essential constraints of the area that make sure that the
// left x-tab is really to the left of the right x-tab, and the top y-tab // left x-tab is really to the left of the right x-tab, and the top y-tab
// really above the bottom y-tab // really above the bottom y-tab
fMinContentWidth = ls->AddConstraint(-1.0, left, 1.0, right, fMinContentWidth = ls->AddConstraint(-1.0, fLeft, 1.0, fRight,
OperatorType(GE), 0); OperatorType(GE), 0);
fMinContentHeight = ls->AddConstraint(-1.0, top, 1.0, bottom, fMinContentHeight = ls->AddConstraint(-1.0, fTop, 1.0, fBottom,
OperatorType(GE), 0); OperatorType(GE), 0);
fConstraints.AddItem(fMinContentWidth); fConstraints.AddItem(fMinContentWidth);
fConstraints.AddItem(fMinContentHeight); fConstraints.AddItem(fMinContentHeight);
fPreferredContentWidth = fLS->AddConstraint(-1.0, fLeft, 1.0, fRight,
OperatorType(EQ), 0, fShrinkPenalties.Height(), fGrowPenalties.Width());
fPreferredContentHeight = fLS->AddConstraint(-1.0, fTop, 1.0, fBottom,
OperatorType(EQ), 0, fShrinkPenalties.Height(),
fGrowPenalties.Height());
fConstraints.AddItem(fPreferredContentWidth);
fConstraints.AddItem(fPreferredContentHeight);
} }
@ -560,8 +569,15 @@ Area::_DoLayout()
void void
Area::_UpdateMinSizeConstraint(BSize min) Area::_UpdateMinSizeConstraint(BSize min)
{ {
fMinContentWidth->SetRightSide(min.Width() + LeftInset() + RightInset()); float width = 0.;
fMinContentHeight->SetRightSide(min.Height() + TopInset() + BottomInset()); float height = 0.;
if (min.width > 0)
width = min.Width() + LeftInset() + RightInset();
if (min.height > 0)
height = min.Height() + TopInset() + BottomInset();
fMinContentWidth->SetRightSide(width);
fMinContentHeight->SetRightSide(height);
} }
@ -604,29 +620,16 @@ Area::_UpdateMaxSizeConstraint(BSize max)
} }
/**
* Sets Preferred size of the area's content.
* May be different from the preferred size of the area.
* Manual changes of PreferredContentSize are ignored unless
* autoPreferredContentSize is set to false.
*/
void void
Area::_UpdatePreferredConstraint(BSize preferred) Area::_UpdatePreferredConstraint(BSize preferred)
{ {
preferred.width += LeftInset() + RightInset(); float width = 64000;
preferred.height += TopInset() + BottomInset(); float height = 64000;
if (fPreferredContentWidth == NULL) { if (preferred.width > 0)
fPreferredContentWidth = fLS->AddConstraint(-1.0, fLeft, 1.0, width = preferred.Width() + LeftInset() + RightInset();
fRight, OperatorType(EQ), preferred.Width(), if (preferred.height > 0)
fShrinkPenalties.Width(), fGrowPenalties.Width()); height = preferred.Height() + TopInset() + BottomInset();
fConstraints.AddItem(fPreferredContentWidth);
fPreferredContentHeight = fLS->AddConstraint(-1.0, fTop, 1.0, fPreferredContentWidth->SetRightSide(width);
fBottom, OperatorType(EQ), preferred.Height(), fPreferredContentHeight->SetRightSide(height);
fShrinkPenalties.Height(), fGrowPenalties.Height());
fConstraints.AddItem(fPreferredContentHeight);
} else {
fPreferredContentWidth->SetRightSide(preferred.Width());
fPreferredContentHeight->SetRightSide(preferred.Height());
}
} }