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

* Cleanup, no functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33615 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-17 13:08:58 +00:00
parent 8be612127e
commit 07dbd4d523
1 changed files with 104 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TwoDimensionalLayout.cpp
+104 -100
View File
@@ -3,6 +3,7 @@
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#include <TwoDimensionalLayout.h> #include <TwoDimensionalLayout.h>
#include <stdio.h> #include <stdio.h>
@@ -214,25 +215,25 @@ private:
// #pragma mark - // #pragma mark -
// constructor
BTwoDimensionalLayout::BTwoDimensionalLayout() BTwoDimensionalLayout::BTwoDimensionalLayout()
: fLeftInset(0), :
fRightInset(0), fLeftInset(0),
fTopInset(0), fRightInset(0),
fBottomInset(0), fTopInset(0),
fHSpacing(0), fBottomInset(0),
fVSpacing(0), fHSpacing(0),
fLocalLayouter(new LocalLayouter(this)) fVSpacing(0),
fLocalLayouter(new LocalLayouter(this))
{ {
} }
// destructor
BTwoDimensionalLayout::~BTwoDimensionalLayout() BTwoDimensionalLayout::~BTwoDimensionalLayout()
{ {
delete fLocalLayouter; delete fLocalLayouter;
} }
// SetInsets
void void
BTwoDimensionalLayout::SetInsets(float left, float top, float right, BTwoDimensionalLayout::SetInsets(float left, float top, float right,
float bottom) float bottom)
@@ -245,7 +246,7 @@ BTwoDimensionalLayout::SetInsets(float left, float top, float right,
InvalidateLayout(); InvalidateLayout();
} }
// GetInsets
void void
BTwoDimensionalLayout::GetInsets(float* left, float* top, float* right, BTwoDimensionalLayout::GetInsets(float* left, float* top, float* right,
float* bottom) const float* bottom) const
@@ -260,7 +261,7 @@ BTwoDimensionalLayout::GetInsets(float* left, float* top, float* right,
*bottom = fBottomInset; *bottom = fBottomInset;
} }
// AlignLayoutWith
void void
BTwoDimensionalLayout::AlignLayoutWith(BTwoDimensionalLayout* other, BTwoDimensionalLayout::AlignLayoutWith(BTwoDimensionalLayout* other,
enum orientation orientation) enum orientation orientation)
@@ -273,7 +274,7 @@ BTwoDimensionalLayout::AlignLayoutWith(BTwoDimensionalLayout* other,
InvalidateLayout(); InvalidateLayout();
} }
// MinSize
BSize BSize
BTwoDimensionalLayout::MinSize() BTwoDimensionalLayout::MinSize()
{ {
@@ -281,7 +282,7 @@ BTwoDimensionalLayout::MinSize()
return AddInsets(fLocalLayouter->MinSize()); return AddInsets(fLocalLayouter->MinSize());
} }
// MaxSize
BSize BSize
BTwoDimensionalLayout::MaxSize() BTwoDimensionalLayout::MaxSize()
{ {
@@ -289,7 +290,7 @@ BTwoDimensionalLayout::MaxSize()
return AddInsets(fLocalLayouter->MaxSize()); return AddInsets(fLocalLayouter->MaxSize());
} }
// PreferredSize
BSize BSize
BTwoDimensionalLayout::PreferredSize() BTwoDimensionalLayout::PreferredSize()
{ {
@@ -297,14 +298,14 @@ BTwoDimensionalLayout::PreferredSize()
return AddInsets(fLocalLayouter->PreferredSize()); return AddInsets(fLocalLayouter->PreferredSize());
} }
// Alignment
BAlignment BAlignment
BTwoDimensionalLayout::Alignment() BTwoDimensionalLayout::Alignment()
{ {
return BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT); return BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT);
} }
// GetHeightForWidth
bool bool
BTwoDimensionalLayout::HasHeightForWidth() BTwoDimensionalLayout::HasHeightForWidth()
{ {
@@ -312,7 +313,7 @@ BTwoDimensionalLayout::HasHeightForWidth()
return fLocalLayouter->HasHeightForWidth(); return fLocalLayouter->HasHeightForWidth();
} }
// GetHeightForWidth
void void
BTwoDimensionalLayout::GetHeightForWidth(float width, float* min, float* max, BTwoDimensionalLayout::GetHeightForWidth(float width, float* min, float* max,
float* preferred) float* preferred)
@@ -326,7 +327,7 @@ BTwoDimensionalLayout::GetHeightForWidth(float width, float* min, float* max,
AddInsets(min, max, preferred); AddInsets(min, max, preferred);
} }
// InvalidateLayout
void void
BTwoDimensionalLayout::InvalidateLayout() BTwoDimensionalLayout::InvalidateLayout()
{ {
@@ -335,7 +336,7 @@ BTwoDimensionalLayout::InvalidateLayout()
fLocalLayouter->InvalidateLayout(); fLocalLayouter->InvalidateLayout();
} }
// LayoutView
void void
BTwoDimensionalLayout::LayoutView() BTwoDimensionalLayout::LayoutView()
{ {
@@ -343,6 +344,7 @@ BTwoDimensionalLayout::LayoutView()
// layout the horizontal/vertical elements // layout the horizontal/vertical elements
BSize size = SubtractInsets(View()->Frame().Size()); BSize size = SubtractInsets(View()->Frame().Size());
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
printf("BTwoDimensionalLayout::LayoutView(%p): size: (%.1f, %.1f)\n", printf("BTwoDimensionalLayout::LayoutView(%p): size: (%.1f, %.1f)\n",
View(), size.width, size.height); View(), size.width, size.height);
@@ -387,7 +389,7 @@ frame.PrintToStream();
} }
} }
// AddInsets
BSize BSize
BTwoDimensionalLayout::AddInsets(BSize size) BTwoDimensionalLayout::AddInsets(BSize size)
{ {
@@ -398,7 +400,7 @@ BTwoDimensionalLayout::AddInsets(BSize size)
return size; return size;
} }
// AddInsets
void void
BTwoDimensionalLayout::AddInsets(float* minHeight, float* maxHeight, BTwoDimensionalLayout::AddInsets(float* minHeight, float* maxHeight,
float* preferredHeight) float* preferredHeight)
@@ -412,7 +414,7 @@ BTwoDimensionalLayout::AddInsets(float* minHeight, float* maxHeight,
*preferredHeight = BLayoutUtils::AddDistances(*preferredHeight, insets); *preferredHeight = BLayoutUtils::AddDistances(*preferredHeight, insets);
} }
// SubtractInsets
BSize BSize
BTwoDimensionalLayout::SubtractInsets(BSize size) BTwoDimensionalLayout::SubtractInsets(BSize size)
{ {
@@ -423,27 +425,27 @@ BTwoDimensionalLayout::SubtractInsets(BSize size)
return size; return size;
} }
// PrepareItems
void void
BTwoDimensionalLayout::PrepareItems(enum orientation orientation) BTwoDimensionalLayout::PrepareItems(enum orientation orientation)
{ {
} }
// HasMultiColumnItems
bool bool
BTwoDimensionalLayout::HasMultiColumnItems() BTwoDimensionalLayout::HasMultiColumnItems()
{ {
return false; return false;
} }
// HasMultiRowItems
bool bool
BTwoDimensionalLayout::HasMultiRowItems() BTwoDimensionalLayout::HasMultiRowItems()
{ {
return false; return false;
} }
// _ValidateMinMax
void void
BTwoDimensionalLayout::_ValidateMinMax() BTwoDimensionalLayout::_ValidateMinMax()
{ {
@@ -453,7 +455,7 @@ BTwoDimensionalLayout::_ValidateMinMax()
view->ResetLayoutInvalidation(); view->ResetLayoutInvalidation();
} }
// _CurrentLayoutContext
BLayoutContext* BLayoutContext*
BTwoDimensionalLayout::_CurrentLayoutContext() BTwoDimensionalLayout::_CurrentLayoutContext()
{ {
@@ -464,45 +466,46 @@ BTwoDimensionalLayout::_CurrentLayoutContext()
// #pragma mark - CompoundLayouter // #pragma mark - CompoundLayouter
// constructor
BTwoDimensionalLayout::CompoundLayouter::CompoundLayouter( BTwoDimensionalLayout::CompoundLayouter::CompoundLayouter(
enum orientation orientation) enum orientation orientation)
: fLayouter(NULL), :
fLayoutInfo(NULL), fLayouter(NULL),
fOrientation(orientation), fLayoutInfo(NULL),
fLocalLayouters(10), fOrientation(orientation),
fLayoutContext(NULL), fLocalLayouters(10),
fLastLayoutSize(-1) fLayoutContext(NULL),
fLastLayoutSize(-1)
{ {
} }
// destructor
BTwoDimensionalLayout::CompoundLayouter::~CompoundLayouter() BTwoDimensionalLayout::CompoundLayouter::~CompoundLayouter()
{ {
} }
// Orientation
orientation orientation
BTwoDimensionalLayout::CompoundLayouter::Orientation() BTwoDimensionalLayout::CompoundLayouter::Orientation()
{ {
return fOrientation; return fOrientation;
} }
// GetLayouter
Layouter* Layouter*
BTwoDimensionalLayout::CompoundLayouter::GetLayouter(bool minMax) BTwoDimensionalLayout::CompoundLayouter::GetLayouter(bool minMax)
{ {
return fLayouter; return fLayouter;
} }
// GetLayoutInfo
LayoutInfo* LayoutInfo*
BTwoDimensionalLayout::CompoundLayouter::GetLayoutInfo() BTwoDimensionalLayout::CompoundLayouter::GetLayoutInfo()
{ {
return fLayoutInfo; return fLayoutInfo;
} }
// AddLocalLayouter
void void
BTwoDimensionalLayout::CompoundLayouter::AddLocalLayouter( BTwoDimensionalLayout::CompoundLayouter::AddLocalLayouter(
LocalLayouter* localLayouter) LocalLayouter* localLayouter)
@@ -515,7 +518,7 @@ BTwoDimensionalLayout::CompoundLayouter::AddLocalLayouter(
} }
} }
// RemoveLocalLayouter
void void
BTwoDimensionalLayout::CompoundLayouter::RemoveLocalLayouter( BTwoDimensionalLayout::CompoundLayouter::RemoveLocalLayouter(
LocalLayouter* localLayouter) LocalLayouter* localLayouter)
@@ -524,7 +527,7 @@ BTwoDimensionalLayout::CompoundLayouter::RemoveLocalLayouter(
InvalidateLayout(); InvalidateLayout();
} }
// AbsorbCompoundLayouter
void void
BTwoDimensionalLayout::CompoundLayouter::AbsorbCompoundLayouter( BTwoDimensionalLayout::CompoundLayouter::AbsorbCompoundLayouter(
CompoundLayouter* other) CompoundLayouter* other)
@@ -543,7 +546,7 @@ BTwoDimensionalLayout::CompoundLayouter::AbsorbCompoundLayouter(
InvalidateLayout(); InvalidateLayout();
} }
// InvalidateLayout
void void
BTwoDimensionalLayout::CompoundLayouter::InvalidateLayout() BTwoDimensionalLayout::CompoundLayouter::InvalidateLayout()
{ {
@@ -565,14 +568,14 @@ BTwoDimensionalLayout::CompoundLayouter::InvalidateLayout()
} }
} }
// IsMinMaxValid
bool bool
BTwoDimensionalLayout::CompoundLayouter::IsMinMaxValid() BTwoDimensionalLayout::CompoundLayouter::IsMinMaxValid()
{ {
return (fLayouter != NULL); return (fLayouter != NULL);
} }
// ValidateMinMax
void void
BTwoDimensionalLayout::CompoundLayouter::ValidateMinMax() BTwoDimensionalLayout::CompoundLayouter::ValidateMinMax()
{ {
@@ -594,15 +597,16 @@ BTwoDimensionalLayout::CompoundLayouter::ValidateMinMax()
fLayouter = new SimpleLayouter(elementCount, _Spacing()); fLayouter = new SimpleLayouter(elementCount, _Spacing());
// tell the layouter about our constraints // tell the layouter about our constraints
// TODO: We should probably ignore local layouters whose view is hidden. It's a bit tricky to find // TODO: We should probably ignore local layouters whose view is hidden.
// out, whether the view is hidden, though, since this doesn't necessarily mean only hidden // It's a bit tricky to find out, whether the view is hidden, though, since
// relative to the parent, but hidden relative to a common parent. // this doesn't necessarily mean only hidden relative to the parent, but
// hidden relative to a common parent.
_AddConstraints(fLayouter); _AddConstraints(fLayouter);
fLayoutInfo = fLayouter->CreateLayoutInfo(); fLayoutInfo = fLayouter->CreateLayoutInfo();
} }
// Layout
void void
BTwoDimensionalLayout::CompoundLayouter::Layout(float size, BTwoDimensionalLayout::CompoundLayouter::Layout(float size,
LocalLayouter* localLayouter, BLayoutContext* context) LocalLayouter* localLayouter, BLayoutContext* context)
@@ -616,7 +620,7 @@ BTwoDimensionalLayout::CompoundLayouter::Layout(float size,
} }
} }
// DoLayout
void void
BTwoDimensionalLayout::CompoundLayouter::DoLayout(float size, BTwoDimensionalLayout::CompoundLayouter::DoLayout(float size,
LocalLayouter* localLayouter, BLayoutContext* context) LocalLayouter* localLayouter, BLayoutContext* context)
@@ -624,7 +628,7 @@ BTwoDimensionalLayout::CompoundLayouter::DoLayout(float size,
fLayouter->Layout(fLayoutInfo, size); fLayouter->Layout(fLayoutInfo, size);
} }
// _PrepareItems
void void
BTwoDimensionalLayout::CompoundLayouter::_PrepareItems() BTwoDimensionalLayout::CompoundLayouter::_PrepareItems()
{ {
@@ -635,7 +639,7 @@ BTwoDimensionalLayout::CompoundLayouter::_PrepareItems()
} }
} }
// _CountElements
int32 int32
BTwoDimensionalLayout::CompoundLayouter::_CountElements() BTwoDimensionalLayout::CompoundLayouter::_CountElements()
{ {
@@ -650,7 +654,7 @@ BTwoDimensionalLayout::CompoundLayouter::_CountElements()
return elementCount; return elementCount;
} }
// _HasMultiElementItems
bool bool
BTwoDimensionalLayout::CompoundLayouter::_HasMultiElementItems() BTwoDimensionalLayout::CompoundLayouter::_HasMultiElementItems()
{ {
@@ -664,7 +668,7 @@ BTwoDimensionalLayout::CompoundLayouter::_HasMultiElementItems()
return false; return false;
} }
// _AddConstraints
void void
BTwoDimensionalLayout::CompoundLayouter::_AddConstraints(Layouter* layouter) BTwoDimensionalLayout::CompoundLayouter::_AddConstraints(Layouter* layouter)
{ {
@@ -675,7 +679,7 @@ BTwoDimensionalLayout::CompoundLayouter::_AddConstraints(Layouter* layouter)
} }
} }
// _Spacing
float float
BTwoDimensionalLayout::CompoundLayouter::_Spacing() BTwoDimensionalLayout::CompoundLayouter::_Spacing()
{ {
@@ -688,18 +692,18 @@ BTwoDimensionalLayout::CompoundLayouter::_Spacing()
// #pragma mark - VerticalCompoundLayouter // #pragma mark - VerticalCompoundLayouter
// constructor
BTwoDimensionalLayout::VerticalCompoundLayouter::VerticalCompoundLayouter() BTwoDimensionalLayout::VerticalCompoundLayouter::VerticalCompoundLayouter()
: CompoundLayouter(B_VERTICAL), :
fHeightForWidthLayouter(NULL), CompoundLayouter(B_VERTICAL),
fCachedMinHeightForWidth(0), fHeightForWidthLayouter(NULL),
fCachedMaxHeightForWidth(0), fCachedMinHeightForWidth(0),
fCachedPreferredHeightForWidth(0), fCachedMaxHeightForWidth(0),
fHeightForWidthLayoutContext(NULL) fCachedPreferredHeightForWidth(0),
fHeightForWidthLayoutContext(NULL)
{ {
} }
// GetLayouter
Layouter* Layouter*
BTwoDimensionalLayout::VerticalCompoundLayouter::GetLayouter(bool minMax) BTwoDimensionalLayout::VerticalCompoundLayouter::GetLayouter(bool minMax)
{ {
@@ -707,7 +711,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::GetLayouter(bool minMax)
? fLayouter : fHeightForWidthLayouter); ? fLayouter : fHeightForWidthLayouter);
} }
// InvalidateLayout
void void
BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateLayout() BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateLayout()
{ {
@@ -716,7 +720,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateLayout()
InvalidateHeightForWidth(); InvalidateHeightForWidth();
} }
// InvalidateHeightForWidth
void void
BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateHeightForWidth() BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateHeightForWidth()
{ {
@@ -735,7 +739,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::InvalidateHeightForWidth()
} }
} }
// InternalGetHeightForWidth
void void
BTwoDimensionalLayout::VerticalCompoundLayouter::InternalGetHeightForWidth( BTwoDimensionalLayout::VerticalCompoundLayouter::InternalGetHeightForWidth(
LocalLayouter* localLayouter, BLayoutContext* context, bool realLayout, LocalLayouter* localLayouter, BLayoutContext* context, bool realLayout,
@@ -798,7 +802,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::InternalGetHeightForWidth(
*preferredHeight = fCachedPreferredHeightForWidth; *preferredHeight = fCachedPreferredHeightForWidth;
} }
// DoLayout
void void
BTwoDimensionalLayout::VerticalCompoundLayouter::DoLayout(float size, BTwoDimensionalLayout::VerticalCompoundLayouter::DoLayout(float size,
LocalLayouter* localLayouter, BLayoutContext* context) LocalLayouter* localLayouter, BLayoutContext* context)
@@ -816,7 +820,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::DoLayout(float size,
layouter->Layout(fLayoutInfo, size); layouter->Layout(fLayoutInfo, size);
} }
// _HasHeightForWidth
bool bool
BTwoDimensionalLayout::VerticalCompoundLayouter::_HasHeightForWidth() BTwoDimensionalLayout::VerticalCompoundLayouter::_HasHeightForWidth()
{ {
@@ -830,7 +834,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::_HasHeightForWidth()
return false; return false;
} }
// _SetHeightForWidthLayoutContext
bool bool
BTwoDimensionalLayout::VerticalCompoundLayouter BTwoDimensionalLayout::VerticalCompoundLayouter
::_SetHeightForWidthLayoutContext(BLayoutContext* context) ::_SetHeightForWidthLayoutContext(BLayoutContext* context)
@@ -859,7 +863,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter
return true; return true;
} }
// LayoutContextLeft
void void
BTwoDimensionalLayout::VerticalCompoundLayouter::LayoutContextLeft( BTwoDimensionalLayout::VerticalCompoundLayouter::LayoutContextLeft(
BLayoutContext* context) BLayoutContext* context)
@@ -871,22 +875,22 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::LayoutContextLeft(
// #pragma mark - LocalLayouter // #pragma mark - LocalLayouter
// constructor
BTwoDimensionalLayout::LocalLayouter::LocalLayouter( BTwoDimensionalLayout::LocalLayouter::LocalLayouter(
BTwoDimensionalLayout* layout) BTwoDimensionalLayout* layout)
: fLayout(layout), :
fHLayouter(new CompoundLayouter(B_HORIZONTAL)), fLayout(layout),
fVLayouter(new VerticalCompoundLayouter), fHLayouter(new CompoundLayouter(B_HORIZONTAL)),
fHeightForWidthItems(), fVLayouter(new VerticalCompoundLayouter),
fHorizontalLayoutContext(NULL), fHeightForWidthItems(),
fHorizontalLayoutWidth(0), fHorizontalLayoutContext(NULL),
fHeightForWidthConstraintsAdded(false) fHorizontalLayoutWidth(0),
fHeightForWidthConstraintsAdded(false)
{ {
fHLayouter->AddLocalLayouter(this); fHLayouter->AddLocalLayouter(this);
fVLayouter->AddLocalLayouter(this); fVLayouter->AddLocalLayouter(this);
} }
// MinSize
BSize BSize
BTwoDimensionalLayout::LocalLayouter::MinSize() BTwoDimensionalLayout::LocalLayouter::MinSize()
{ {
@@ -894,7 +898,7 @@ BTwoDimensionalLayout::LocalLayouter::MinSize()
fVLayouter->GetLayouter(true)->MinSize()); fVLayouter->GetLayouter(true)->MinSize());
} }
// MaxSize
BSize BSize
BTwoDimensionalLayout::LocalLayouter::MaxSize() BTwoDimensionalLayout::LocalLayouter::MaxSize()
{ {
@@ -902,7 +906,7 @@ BTwoDimensionalLayout::LocalLayouter::MaxSize()
fVLayouter->GetLayouter(true)->MaxSize()); fVLayouter->GetLayouter(true)->MaxSize());
} }
// PreferredSize
BSize BSize
BTwoDimensionalLayout::LocalLayouter::PreferredSize() BTwoDimensionalLayout::LocalLayouter::PreferredSize()
{ {
@@ -910,7 +914,7 @@ BTwoDimensionalLayout::LocalLayouter::PreferredSize()
fVLayouter->GetLayouter(true)->PreferredSize()); fVLayouter->GetLayouter(true)->PreferredSize());
} }
// InvalidateLayout
void void
BTwoDimensionalLayout::LocalLayouter::InvalidateLayout() BTwoDimensionalLayout::LocalLayouter::InvalidateLayout()
{ {
@@ -918,7 +922,7 @@ BTwoDimensionalLayout::LocalLayouter::InvalidateLayout()
fVLayouter->InvalidateLayout(); fVLayouter->InvalidateLayout();
} }
// Layout
void void
BTwoDimensionalLayout::LocalLayouter::Layout(BSize size) BTwoDimensionalLayout::LocalLayouter::Layout(BSize size)
{ {
@@ -926,7 +930,7 @@ BTwoDimensionalLayout::LocalLayouter::Layout(BSize size)
fVLayouter->Layout(size.height, this, fLayout->_CurrentLayoutContext()); fVLayouter->Layout(size.height, this, fLayout->_CurrentLayoutContext());
} }
// ItemFrame
BRect BRect
BTwoDimensionalLayout::LocalLayouter::ItemFrame(Dimensions itemDimensions) BTwoDimensionalLayout::LocalLayouter::ItemFrame(Dimensions itemDimensions)
{ {
@@ -941,7 +945,7 @@ BTwoDimensionalLayout::LocalLayouter::ItemFrame(Dimensions itemDimensions)
return BRect(x, y, x + width, y + height); return BRect(x, y, x + width, y + height);
} }
// ValidateMinMax
void void
BTwoDimensionalLayout::LocalLayouter::ValidateMinMax() BTwoDimensionalLayout::LocalLayouter::ValidateMinMax()
{ {
@@ -957,7 +961,7 @@ BTwoDimensionalLayout::LocalLayouter::ValidateMinMax()
fVLayouter->ValidateMinMax(); fVLayouter->ValidateMinMax();
} }
// DoHorizontalLayout
void void
BTwoDimensionalLayout::LocalLayouter::DoHorizontalLayout(float width) BTwoDimensionalLayout::LocalLayouter::DoHorizontalLayout(float width)
{ {
@@ -970,7 +974,7 @@ BTwoDimensionalLayout::LocalLayouter::DoHorizontalLayout(float width)
} }
} }
// InternalGetHeightForWidth
void void
BTwoDimensionalLayout::LocalLayouter::InternalGetHeightForWidth(float width, BTwoDimensionalLayout::LocalLayouter::InternalGetHeightForWidth(float width,
float* minHeight, float* maxHeight, float* preferredHeight) float* minHeight, float* maxHeight, float* preferredHeight)
@@ -980,7 +984,7 @@ BTwoDimensionalLayout::LocalLayouter::InternalGetHeightForWidth(float width,
minHeight, maxHeight, preferredHeight); minHeight, maxHeight, preferredHeight);
} }
// AlignWith
void void
BTwoDimensionalLayout::LocalLayouter::AlignWith(LocalLayouter* other, BTwoDimensionalLayout::LocalLayouter::AlignWith(LocalLayouter* other,
enum orientation orientation) enum orientation orientation)
@@ -991,7 +995,7 @@ BTwoDimensionalLayout::LocalLayouter::AlignWith(LocalLayouter* other,
other->fVLayouter->AbsorbCompoundLayouter(fVLayouter); other->fVLayouter->AbsorbCompoundLayouter(fVLayouter);
} }
// PrepareItems
void void
BTwoDimensionalLayout::LocalLayouter::PrepareItems( BTwoDimensionalLayout::LocalLayouter::PrepareItems(
CompoundLayouter* compoundLayouter) CompoundLayouter* compoundLayouter)
@@ -999,7 +1003,7 @@ BTwoDimensionalLayout::LocalLayouter::PrepareItems(
fLayout->PrepareItems(compoundLayouter->Orientation()); fLayout->PrepareItems(compoundLayouter->Orientation());
} }
// CountElements
int32 int32
BTwoDimensionalLayout::LocalLayouter::CountElements( BTwoDimensionalLayout::LocalLayouter::CountElements(
CompoundLayouter* compoundLayouter) CompoundLayouter* compoundLayouter)
@@ -1010,7 +1014,7 @@ BTwoDimensionalLayout::LocalLayouter::CountElements(
return fLayout->InternalCountRows(); return fLayout->InternalCountRows();
} }
// HasMultiElementItems
bool bool
BTwoDimensionalLayout::LocalLayouter::HasMultiElementItems( BTwoDimensionalLayout::LocalLayouter::HasMultiElementItems(
CompoundLayouter* compoundLayouter) CompoundLayouter* compoundLayouter)
@@ -1021,7 +1025,7 @@ BTwoDimensionalLayout::LocalLayouter::HasMultiElementItems(
return fLayout->HasMultiRowItems(); return fLayout->HasMultiRowItems();
} }
// AddConstraints
void void
BTwoDimensionalLayout::LocalLayouter::AddConstraints( BTwoDimensionalLayout::LocalLayouter::AddConstraints(
CompoundLayouter* compoundLayouter, Layouter* layouter) CompoundLayouter* compoundLayouter, Layouter* layouter)
@@ -1074,7 +1078,7 @@ BTwoDimensionalLayout::LocalLayouter::AddConstraints(
} }
} }
// Spacing
float float
BTwoDimensionalLayout::LocalLayouter::Spacing( BTwoDimensionalLayout::LocalLayouter::Spacing(
CompoundLayouter* compoundLayouter) CompoundLayouter* compoundLayouter)
@@ -1083,14 +1087,14 @@ BTwoDimensionalLayout::LocalLayouter::Spacing(
? fLayout->fHSpacing : fLayout->fVSpacing); ? fLayout->fHSpacing : fLayout->fVSpacing);
} }
// HasHeightForWidth
bool bool
BTwoDimensionalLayout::LocalLayouter::HasHeightForWidth() BTwoDimensionalLayout::LocalLayouter::HasHeightForWidth()
{ {
return !fHeightForWidthItems.IsEmpty(); return !fHeightForWidthItems.IsEmpty();
} }
// AddHeightForWidthConstraints
bool bool
BTwoDimensionalLayout::LocalLayouter::AddHeightForWidthConstraints( BTwoDimensionalLayout::LocalLayouter::AddHeightForWidthConstraints(
VerticalCompoundLayouter* compoundLayouter, Layouter* layouter, VerticalCompoundLayouter* compoundLayouter, Layouter* layouter,
@@ -1129,7 +1133,7 @@ BTwoDimensionalLayout::LocalLayouter::AddHeightForWidthConstraints(
return true; return true;
} }
// SetHeightForWidthConstraintsAdded
void void
BTwoDimensionalLayout::LocalLayouter::SetHeightForWidthConstraintsAdded( BTwoDimensionalLayout::LocalLayouter::SetHeightForWidthConstraintsAdded(
bool added) bool added)
@@ -1137,7 +1141,7 @@ BTwoDimensionalLayout::LocalLayouter::SetHeightForWidthConstraintsAdded(
fHeightForWidthConstraintsAdded = added; fHeightForWidthConstraintsAdded = added;
} }
// SetCompoundLayouter
void void
BTwoDimensionalLayout::LocalLayouter::SetCompoundLayouter( BTwoDimensionalLayout::LocalLayouter::SetCompoundLayouter(
CompoundLayouter* compoundLayouter, enum orientation orientation) CompoundLayouter* compoundLayouter, enum orientation orientation)
@@ -1150,7 +1154,7 @@ BTwoDimensionalLayout::LocalLayouter::SetCompoundLayouter(
InternalInvalidateLayout(compoundLayouter); InternalInvalidateLayout(compoundLayouter);
} }
// InternalInvalidateLayout
void void
BTwoDimensionalLayout::LocalLayouter::InternalInvalidateLayout( BTwoDimensionalLayout::LocalLayouter::InternalInvalidateLayout(
CompoundLayouter* compoundLayouter) CompoundLayouter* compoundLayouter)
@@ -1160,7 +1164,7 @@ BTwoDimensionalLayout::LocalLayouter::InternalInvalidateLayout(
fLayout->BLayout::InvalidateLayout(); fLayout->BLayout::InvalidateLayout();
} }
// _SetHorizontalLayoutContext
void void
BTwoDimensionalLayout::LocalLayouter::_SetHorizontalLayoutContext( BTwoDimensionalLayout::LocalLayouter::_SetHorizontalLayoutContext(
BLayoutContext* context, float width) BLayoutContext* context, float width)
@@ -1178,7 +1182,7 @@ BTwoDimensionalLayout::LocalLayouter::_SetHorizontalLayoutContext(
fHorizontalLayoutWidth = width; fHorizontalLayoutWidth = width;
} }
// LayoutContextLeft
void void
BTwoDimensionalLayout::LocalLayouter::LayoutContextLeft(BLayoutContext* context) BTwoDimensionalLayout::LocalLayouter::LayoutContextLeft(BLayoutContext* context)
{ {