BALMLayout now takes the view min, max and pref values into account. Previously it managed its own values.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38769 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+10
-9
@@ -54,12 +54,7 @@ public:
|
||||
XTab* ContentRight() const;
|
||||
YTab* ContentBottom() const;
|
||||
BSize MinContentSize() const;
|
||||
|
||||
void SetMinContentSize(BSize min);
|
||||
BSize MaxContentSize() const;
|
||||
void SetMaxContentSize(BSize max);
|
||||
BSize PreferredContentSize() const;
|
||||
void SetPreferredContentSize(BSize preferred);
|
||||
|
||||
double ContentAspectRatio() const;
|
||||
void SetContentAspectRatio(double ratio);
|
||||
|
||||
@@ -94,6 +89,8 @@ public:
|
||||
Constraint* HasSameHeightAs(Area* area);
|
||||
BList* HasSameSizeAs(Area* area);
|
||||
|
||||
void InvalidateSizeConstraints();
|
||||
|
||||
protected:
|
||||
Area(BALMLayout* layout, BLayoutItem* item);
|
||||
|
||||
@@ -106,9 +103,13 @@ protected:
|
||||
void DoLayout();
|
||||
|
||||
private:
|
||||
void InitChildArea();
|
||||
void UpdateHorizontal();
|
||||
void UpdateVertical();
|
||||
void _InitChildArea();
|
||||
void _UpdateHorizontal();
|
||||
void _UpdateVertical();
|
||||
|
||||
void _UpdateMinSizeConstraint(BSize min);
|
||||
void _UpdateMaxSizeConstraint(BSize max);
|
||||
void _UpdatePreferredConstraint(BSize preferred);
|
||||
|
||||
public:
|
||||
static BSize kMaxSize;
|
||||
|
||||
@@ -79,6 +79,7 @@ public:
|
||||
|
||||
private:
|
||||
Area* _AreaForItem(BLayoutItem* item) const;
|
||||
void _UpdateAreaConstraints();
|
||||
|
||||
BSize CalculateMinSize();
|
||||
BSize CalculateMaxSize();
|
||||
|
||||
Reference in New Issue
Block a user