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

BLayoutBuilder::Grid::{AddMenuField,AddTextControl}(): Use separate column

Browse Source 
count parameters for label and control view. Most likely when one doesn't want
to use the default value (1), the label and the view will cover a different
amount of columns.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39465 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-11-17 16:29:06 +00:00
parent b3b19de56b
commit e4acf496c6
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/LayoutBuilder.h
+15 -9
View File
@@ -135,12 +135,16 @@ public:
int32 column, int32 row, int32 column, int32 row,
alignment labelAlignment alignment labelAlignment
= B_ALIGN_HORIZONTAL_UNSET, = B_ALIGN_HORIZONTAL_UNSET,
int32 columnCount = 1, int32 rowCount = 1); int32 labelColumnCount = 1,
int32 fieldColumnCount = 1,
int32 rowCount = 1);
inline ThisBuilder& AddTextControl(BTextControl* textControl, inline ThisBuilder& AddTextControl(BTextControl* textControl,
int32 column, int32 row, int32 column, int32 row,
alignment labelAlignment alignment labelAlignment
= B_ALIGN_HORIZONTAL_UNSET, = B_ALIGN_HORIZONTAL_UNSET,
int32 columnCount = 1, int32 rowCount = 1); int32 labelColumnCount = 1,
int32 textColumnCount = 1,
int32 rowCount = 1);
inline GroupBuilder AddGroup(enum orientation orientation, inline GroupBuilder AddGroup(enum orientation orientation,
float spacing, int32 column, int32 row, float spacing, int32 column, int32 row,
@@ -608,14 +612,15 @@ Grid<ParentBuilder>::Add(BLayoutItem* item, int32 column, int32 row,
template<typename ParentBuilder> template<typename ParentBuilder>
typename Grid<ParentBuilder>::ThisBuilder& typename Grid<ParentBuilder>::ThisBuilder&
Grid<ParentBuilder>::AddMenuField(BMenuField* menuField, int32 column, Grid<ParentBuilder>::AddMenuField(BMenuField* menuField, int32 column,
int32 row, alignment labelAlignment, int32 columnCount, int32 rowCount) int32 row, alignment labelAlignment, int32 labelColumnCount,
int32 fieldColumnCount, int32 rowCount)
{ {
BLayoutItem* item = menuField->CreateLabelLayoutItem(); BLayoutItem* item = menuField->CreateLabelLayoutItem();
item->SetExplicitAlignment( item->SetExplicitAlignment(
BAlignment(labelAlignment, B_ALIGN_VERTICAL_UNSET)); BAlignment(labelAlignment, B_ALIGN_VERTICAL_UNSET));
fLayout->AddItem(item, column, row, columnCount, rowCount); fLayout->AddItem(item, column, row, labelColumnCount, rowCount);
fLayout->AddItem(menuField->CreateMenuBarLayoutItem(), column + columnCount, fLayout->AddItem(menuField->CreateMenuBarLayoutItem(),
row, columnCount, rowCount); column + labelColumnCount, row, fieldColumnCount, rowCount);
return *this; return *this;
} }
@@ -623,14 +628,15 @@ Grid<ParentBuilder>::AddMenuField(BMenuField* menuField, int32 column,
template<typename ParentBuilder> template<typename ParentBuilder>
typename Grid<ParentBuilder>::ThisBuilder& typename Grid<ParentBuilder>::ThisBuilder&
Grid<ParentBuilder>::AddTextControl(BTextControl* textControl, int32 column, Grid<ParentBuilder>::AddTextControl(BTextControl* textControl, int32 column,
int32 row, alignment labelAlignment, int32 columnCount, int32 rowCount) int32 row, alignment labelAlignment, int32 labelColumnCount,
int32 textColumnCount, int32 rowCount)
{ {
BLayoutItem* item = textControl->CreateLabelLayoutItem(); BLayoutItem* item = textControl->CreateLabelLayoutItem();
item->SetExplicitAlignment( item->SetExplicitAlignment(
BAlignment(labelAlignment, B_ALIGN_VERTICAL_UNSET)); BAlignment(labelAlignment, B_ALIGN_VERTICAL_UNSET));
fLayout->AddItem(item, column, row, columnCount, rowCount); fLayout->AddItem(item, column, row, labelColumnCount, rowCount);
fLayout->AddItem(textControl->CreateTextViewLayoutItem(), fLayout->AddItem(textControl->CreateTextViewLayoutItem(),
column + columnCount, row, columnCount, rowCount); column + labelColumnCount, row, textColumnCount, rowCount);
return *this; return *this;
} }