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

Backgrounds: View layout updates

Browse Source 
* Replace the stringViews with CreateLabelLayoutItem()s and menus
   with CreateMenuBarLayoutItem().
* Remove extra group levels
* Use font aware spacing units in layout constructor.
* Align the fIconLabelOutline check box with the menu fields
  instead of the menu field labels.
This commit is contained in:
John Scipione
2013-05-31 18:33:56 -04:00
parent 56cf4a96bc
commit 94e6903259
1 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/backgrounds/BackgroundsView.cpp
+13 -27
View File
@@ -164,7 +164,8 @@ BackgroundsView::BackgroundsView()
fImageMenu->AddItem(new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS), fImageMenu->AddItem(new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS),
new BMessage(kMsgOtherImage))); new BMessage(kMsgOtherImage)));
BMenuField* imageMenuField = new BMenuField(NULL, fImageMenu); BMenuField* imageMenuField = new BMenuField("image",
B_TRANSLATE("Image:"), fImageMenu);
imageMenuField->SetAlignment(B_ALIGN_RIGHT); imageMenuField->SetAlignment(B_ALIGN_RIGHT);
imageMenuField->ResizeToPreferred(); imageMenuField->ResizeToPreferred();
@@ -178,7 +179,8 @@ BackgroundsView::BackgroundsView()
fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Tile"), fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Tile"),
new BMessage(kMsgTilePlacement))); new BMessage(kMsgTilePlacement)));
BMenuField* placementMenuField = new BMenuField(NULL, fPlacementMenu); BMenuField* placementMenuField = new BMenuField("placement",
B_TRANSLATE("Placement:"), fPlacementMenu);
placementMenuField->SetAlignment(B_ALIGN_RIGHT); placementMenuField->SetAlignment(B_ALIGN_RIGHT);
fIconLabelOutline = new BCheckBox(B_TRANSLATE("Icon label outline"), fIconLabelOutline = new BCheckBox(B_TRANSLATE("Icon label outline"),
@@ -188,33 +190,17 @@ BackgroundsView::BackgroundsView()
fPicker = new BColorControl(BPoint(0, 0), B_CELLS_32x8, 7.0, "Picker", fPicker = new BColorControl(BPoint(0, 0), B_CELLS_32x8, 7.0, "Picker",
new BMessage(kMsgUpdateColor)); new BMessage(kMsgUpdateColor));
BStringView* imageStringView = rightbox->AddChild(BLayoutBuilder::Group<>(B_VERTICAL, B_USE_DEFAULT_SPACING)
new BStringView(NULL, B_TRANSLATE("Image:")); .AddGrid(B_USE_DEFAULT_SPACING, B_USE_SMALL_SPACING)
BStringView* placementStringView = .Add(imageMenuField->CreateLabelLayoutItem(), 0, 0)
new BStringView(NULL, B_TRANSLATE("Placement:")); .Add(imageMenuField->CreateMenuBarLayoutItem(), 1, 0)
.Add(placementMenuField->CreateLabelLayoutItem(), 0, 1)
imageStringView->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, .Add(placementMenuField->CreateMenuBarLayoutItem(), 1, 1)
B_ALIGN_NO_VERTICAL)); .Add(fIconLabelOutline, 1, 2)
placementStringView->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT,
B_ALIGN_NO_VERTICAL));
view = BLayoutBuilder::Group<>()
.AddGroup(B_VERTICAL, 10)
.AddGroup(B_VERTICAL, 10)
.AddGrid(10, 10)
.Add(imageStringView, 0, 0)
.Add(placementStringView, 0, 1)
.Add(imageMenuField, 1, 0)
.Add(placementMenuField, 1, 1)
.End()
.Add(fIconLabelOutline)
.End() .End()
.Add(fPicker) .Add(fPicker)
.SetInsets(10, 10, 10, 10) .SetInsets(B_USE_DEFAULT_SPACING)
.End() .View());
.View();
rightbox->AddChild(view);
fRevert = new BButton(B_TRANSLATE("Revert"), fRevert = new BButton(B_TRANSLATE("Revert"),
new BMessage(kMsgRevertSettings)); new BMessage(kMsgRevertSettings));