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

* Made BTwoDimensionalLayout and BSplitLayout::GetInsets() const.

Browse Source 
* Give access to BSplitLayout::SetInsets() and GetInsets() from BSplitView.
* Give access to BSplitView::SetInsets() from BSplitLayoutBuilder and
  LayoutBuilder.
* Some automatic white-space cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31197 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-06-23 10:56:22 +00:00
parent e27f201987
commit 4aeb7a3cc2
9 changed files with 66 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/LayoutBuilder.h
+13
View File
@@ -175,6 +175,9 @@ public:
inline ThisBuilder& SetCollapsible(int32 first, int32 last,
bool collapsible);
inline ThisBuilder& SetInsets(float left, float top, float right,
float bottom);
inline operator BSplitView*();
private:
@@ -702,6 +705,16 @@ Split<ParentBuilder>::SetCollapsible(int32 first, int32 last, bool collapsible)
}
template<typename ParentBuilder>
typename Split<ParentBuilder>::ThisBuilder&
Split<ParentBuilder>::SetInsets(float left, float top, float right,
float bottom)
{
fView->SetInsets(left, top, right, bottom);
return *this;
}
template<typename ParentBuilder>
Split<ParentBuilder>::operator BSplitView*()
{
headers/os/interface/SplitLayoutBuilder.h
+3
View File
@@ -24,6 +24,9 @@ public:
BSplitLayoutBuilder& SetCollapsible(bool collapsible);
BSplitLayoutBuilder& SetInsets(float left, float top, float right,
float bottom);
operator BSplitView*();
private:
headers/os/interface/SplitView.h
+5
View File
@@ -17,6 +17,11 @@ public:
float spacing = 0.0f);
virtual ~BSplitView();
void SetInsets(float left, float top, float right,
float bottom);
void GetInsets(float* left, float* top, float* right,
float* bottom) const;
float Spacing() const;
void SetSpacing(float spacing);
headers/os/interface/TwoDimensionalLayout.h
+2 -2
View File
@@ -18,7 +18,7 @@ public:
void SetInsets(float left, float top, float right,
float bottom);
void GetInsets(float* left, float* top, float* right,
float* bottom);
float* bottom) const;
void AlignLayoutWith(BTwoDimensionalLayout* other,
enum orientation orientation);
@@ -58,7 +58,7 @@ protected:
virtual void PrepareItems(enum orientation orientation);
virtual bool HasMultiColumnItems();
virtual bool HasMultiRowItems();
virtual int32 InternalCountColumns() = 0;
virtual int32 InternalCountRows() = 0;
virtual void GetColumnRowConstraints(
src/kits/interface/SplitLayout.cpp
+2 -1
View File
@@ -192,7 +192,8 @@ BSplitLayout::SetInsets(float left, float top, float right, float bottom)
// GetInsets
void
BSplitLayout::GetInsets(float* left, float* top, float* right, float* bottom)
BSplitLayout::GetInsets(float* left, float* top, float* right,
float* bottom) const
{
if (left)
*left = fLeftInset;
src/kits/interface/SplitLayout.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
void SetInsets(float left, float top, float right,
float bottom);
void GetInsets(float* left, float* top, float* right,
float* bottom);
float* bottom) const;
float Spacing() const;
void SetSpacing(float spacing);
src/kits/interface/SplitLayoutBuilder.cpp
+9
View File
@@ -81,6 +81,15 @@ BSplitLayoutBuilder::SetCollapsible(bool collapsible)
return *this;
}
// SetInsets
BSplitLayoutBuilder&
BSplitLayoutBuilder::SetInsets(float left, float top, float right, float bottom)
{
fView->SetInsets(left, top, right, bottom);
return *this;
}
// cast operator BSplitView*
BSplitLayoutBuilder::operator BSplitView*()
{
src/kits/interface/SplitView.cpp
+15
View File
@@ -55,6 +55,21 @@ BSplitView::~BSplitView()
{
}
// SetInsets
void
BSplitView::SetInsets(float left, float top, float right, float bottom)
{
fSplitLayout->SetInsets(left, top, right, bottom);
}
// GetInsets
void
BSplitView::GetInsets(float* left, float* top, float* right,
float* bottom) const
{
fSplitLayout->GetInsets(left, top, right, bottom);
}
// Spacing
float
BSplitView::Spacing() const
src/kits/interface/TwoDimensionalLayout.cpp
+16 -16
View File
@@ -59,13 +59,13 @@ public:
virtual Layouter* GetLayouter(bool minMax);
LayoutInfo* GetLayoutInfo();
void AddLocalLayouter(LocalLayouter* localLayouter);
void RemoveLocalLayouter(
LocalLayouter* localLayouter);
void AbsorbCompoundLayouter(CompoundLayouter* other);
virtual void InvalidateLayout();
bool IsMinMaxValid();
void ValidateMinMax();
@@ -105,7 +105,7 @@ public:
virtual void InvalidateLayout();
void InvalidateHeightForWidth();
void InternalGetHeightForWidth(
LocalLayouter* localLayouter,
BLayoutContext* context,
@@ -148,7 +148,7 @@ public:
void Layout(BSize size);
BRect ItemFrame(Dimensions itemDimensions);
void ValidateMinMax();
void DoHorizontalLayout(float width);
@@ -159,7 +159,7 @@ public:
void AlignWith(LocalLayouter* other,
enum orientation orientation);
// interface for the compound layout context
@@ -183,14 +183,14 @@ public:
Layouter* layouter,
BLayoutContext* context);
void SetHeightForWidthConstraintsAdded(bool added);
void SetCompoundLayouter(
CompoundLayouter* compoundLayouter,
enum orientation orientation);
void InternalInvalidateLayout(
CompoundLayouter* compoundLayouter);
// implementation private
private:
BTwoDimensionalLayout* fLayout;
@@ -202,7 +202,7 @@ private:
BLayoutContext* fHorizontalLayoutContext;
float fHorizontalLayoutWidth;
bool fHeightForWidthConstraintsAdded;
void _SetHorizontalLayoutContext(
BLayoutContext* context, float width);
@@ -248,7 +248,7 @@ BTwoDimensionalLayout::SetInsets(float left, float top, float right,
// GetInsets
void
BTwoDimensionalLayout::GetInsets(float* left, float* top, float* right,
float* bottom)
float* bottom) const
{
if (left)
*left = fLeftInset;
@@ -379,7 +379,7 @@ frame.PrintToStream();
// preferredHeight);
//}
}
item->AlignInFrame(frame);
}
//else
@@ -499,7 +499,7 @@ BTwoDimensionalLayout::CompoundLayouter::GetLayoutInfo()
return fLayoutInfo;
}
// AddLocalLayouter
// AddLocalLayouter
void
BTwoDimensionalLayout::CompoundLayouter::AddLocalLayouter(
LocalLayouter* localLayouter)
@@ -536,7 +536,7 @@ BTwoDimensionalLayout::CompoundLayouter::AbsorbCompoundLayouter(
AddLocalLayouter(layouter);
layouter->SetCompoundLayouter(this, fOrientation);
}
InvalidateLayout();
}
@@ -605,7 +605,7 @@ BTwoDimensionalLayout::CompoundLayouter::Layout(float size,
LocalLayouter* localLayouter, BLayoutContext* context)
{
ValidateMinMax();
if (context != fLayoutContext || fLastLayoutSize != size) {
DoLayout(size, localLayouter, context);
fLayoutContext = context;
@@ -852,7 +852,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter
fHeightForWidthLayoutContext->AddListener(this);
InvalidateHeightForWidth();
return true;
}
@@ -868,7 +868,7 @@ BTwoDimensionalLayout::VerticalCompoundLayouter::LayoutContextLeft(
// #pragma mark - LocalLayouter
// constructor
// constructor
BTwoDimensionalLayout::LocalLayouter::LocalLayouter(
BTwoDimensionalLayout* layout)
: fLayout(layout),
@@ -1100,7 +1100,7 @@ BTwoDimensionalLayout::LocalLayouter::AddHeightForWidthConstraints(
return false;
LayoutInfo* hLayoutInfo = fHLayouter->GetLayoutInfo();
// add the children's height for width constraints
int32 itemCount = fHeightForWidthItems.CountItems();
for (int32 i = 0; i < itemCount; i++) {