Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use templatized version of BLayoutBuilder

Browse Source 
...also more B_USE_WINDOW_SPACING
This commit is contained in:
Humdinger 2015-11-07 16:54:41 +01:00
parent d0ac609964
commit 744a39273b
9 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/activitymonitor/SettingsWindow.cpp
View File

@ -10,7 +10,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <Catalog.h> #include <Catalog.h>
#include <GridLayoutBuilder.h> #include <LayoutBuilder.h>
#include <GroupLayoutBuilder.h> #include <GroupLayoutBuilder.h>
#include <Slider.h> #include <Slider.h>
#include <String.h> #include <String.h>
@ -94,17 +94,15 @@ SettingsWindow::SettingsWindow(ActivityWindow* target)
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS), B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
fTarget(target) fTarget(target)
{ {
SetLayout(new BGroupLayout(B_VERTICAL));
fIntervalSlider = new IntervalSlider(B_TRANSLATE("Update time interval:"), fIntervalSlider = new IntervalSlider(B_TRANSLATE("Update time interval:"),
new BMessage(kMsgUpdateTimeInterval), kNumUpdateIntervals); new BMessage(kMsgUpdateTimeInterval), kNumUpdateIntervals);
fIntervalSlider->SetInterval(target->RefreshInterval()); fIntervalSlider->SetInterval(target->RefreshInterval());
// controls pane // controls pane
AddChild(BGroupLayoutBuilder(B_VERTICAL) BLayoutBuilder::Group<>(this, B_VERTICAL)
.Add(fIntervalSlider) .Add(fIntervalSlider)
.SetInsets(10, 10, 10, 10) .SetInsets(B_USE_WINDOW_SPACING);
);
if (target->IsAlwaysOnTop()) if (target->IsAlwaysOnTop())
SetFeel(B_MODAL_ALL_WINDOW_FEEL); SetFeel(B_MODAL_ALL_WINDOW_FEEL);
} }

11
src/apps/diskprobe/AttributeWindow.cpp
View File

@ -14,9 +14,8 @@
#include <Alert.h> #include <Alert.h>
#include <Catalog.h> #include <Catalog.h>
#include <Directory.h> #include <Directory.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <GroupView.h> #include <GroupView.h>
#include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <MenuBar.h> #include <MenuBar.h>
#include <MenuItem.h> #include <MenuItem.h>
@ -72,10 +71,10 @@ EditorTabView::SetTypeEditorTab(BView *view)
} }
BGroupView* group = new BGroupView(B_VERTICAL); BGroupView* group = new BGroupView(B_VERTICAL);
BGroupLayoutBuilder(group) BLayoutBuilder::Group<>(group, B_VERTICAL)
.AddGlue() .SetInsets(B_USE_WINDOW_SPACING, 0, B_USE_WINDOW_SPACING, 0)
.Add(view, 0) .Add(view)
.AddGlue(); .AddGlue(25.0f);
group->SetName(view->Name()); group->SetName(view->Name());

9
src/apps/diskprobe/TypeEditors.cpp
View File

@ -14,9 +14,8 @@
#include <Autolock.h> #include <Autolock.h>
#include <Bitmap.h> #include <Bitmap.h>
#include <Catalog.h> #include <Catalog.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <IconUtils.h> #include <IconUtils.h>
#include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <MenuField.h> #include <MenuField.h>
#include <MenuItem.h> #include <MenuItem.h>
@ -852,8 +851,6 @@ ImageView::ImageView(DataEditor &editor)
fBitmap(NULL), fBitmap(NULL),
fScaleSlider(NULL) fScaleSlider(NULL)
{ {
BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL);
SetLayout(layout);
if (editor.Type() == B_MINI_ICON_TYPE if (editor.Type() == B_MINI_ICON_TYPE
|| editor.Type() == B_LARGE_ICON_TYPE || editor.Type() == B_LARGE_ICON_TYPE
#ifdef HAIKU_TARGET_PLATFORM_HAIKU #ifdef HAIKU_TARGET_PLATFORM_HAIKU
@ -877,7 +874,7 @@ ImageView::ImageView(DataEditor &editor)
fScaleSlider->SetHashMarks(B_HASH_MARKS_BOTH); fScaleSlider->SetHashMarks(B_HASH_MARKS_BOTH);
fScaleSlider->SetHashMarkCount(15); fScaleSlider->SetHashMarkCount(15);
BGroupLayoutBuilder(layout) BLayoutBuilder::Group<>(this, B_HORIZONTAL)
.SetInsets(B_USE_WINDOW_SPACING, 256, B_USE_WINDOW_SPACING, .SetInsets(B_USE_WINDOW_SPACING, 256, B_USE_WINDOW_SPACING,
B_H_SCROLL_BAR_HEIGHT) // Leave space for the icon B_H_SCROLL_BAR_HEIGHT) // Leave space for the icon
.AddGlue() .AddGlue()
@ -887,7 +884,7 @@ ImageView::ImageView(DataEditor &editor)
.End() .End()
.AddGlue(); .AddGlue();
} else { } else {
BGroupLayoutBuilder(layout) BLayoutBuilder::Group<>(this, B_HORIZONTAL)
.SetInsets(B_USE_WINDOW_SPACING, 256, B_USE_WINDOW_SPACING, .SetInsets(B_USE_WINDOW_SPACING, 256, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING) // Leave space for the icon B_USE_WINDOW_SPACING) // Leave space for the icon
.AddGlue() .AddGlue()

24
src/apps/firstbootprompt/BootPromptWindow.cpp
View File

@ -187,14 +187,10 @@ BootPromptWindow::BootPromptWindow()
_PopulateLanguages(); _PopulateLanguages();
_PopulateKeymaps(); _PopulateKeymaps();
float spacing = be_control_look->DefaultItemSpacing(); BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
.AddGroup(B_HORIZONTAL)
SetLayout(new BGroupLayout(B_HORIZONTAL)); .AddGroup(B_VERTICAL)
.AddGroup(B_VERTICAL)
AddChild(BLayoutBuilder::Group<>(B_VERTICAL, 0)
.AddGroup(B_HORIZONTAL, spacing)
.AddGroup(B_VERTICAL, spacing)
.AddGroup(B_VERTICAL, spacing)
.Add(fLanguagesLabelView) .Add(fLanguagesLabelView)
.Add(languagesScrollView) .Add(languagesScrollView)
.End() .End()
@ -203,17 +199,17 @@ BootPromptWindow::BootPromptWindow()
.End() .End()
.End() .End()
.Add(fInfoTextView) .Add(fInfoTextView)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING)
.End() .End()
.Add(new BSeparatorView(B_HORIZONTAL)) .Add(new BSeparatorView(B_HORIZONTAL))
.AddGroup(B_HORIZONTAL, spacing) .AddGroup(B_HORIZONTAL)
.AddGlue() .AddGlue()
.Add(fInstallerButton) .Add(fInstallerButton)
.Add(fDesktopButton) .Add(fDesktopButton)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING,
.End() B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING)
.View() .End();
);
fLanguagesListView->MakeFocus(); fLanguagesListView->MakeFocus();

13
src/apps/mail/Prefs.cpp
View File

@ -44,7 +44,7 @@ of their respective holders. All rights reserved.
#include <CharacterSetRoster.h> #include <CharacterSetRoster.h>
#include <E-mail.h> #include <E-mail.h>
#include <GridView.h> #include <GridView.h>
#include <GroupLayoutBuilder.h> #include <LayoutBuilder.h>
#include <InterfaceKit.h> #include <InterfaceKit.h>
#include <Locale.h> #include <Locale.h>
#include <MailSettings.h> #include <MailSettings.h>
@ -263,19 +263,16 @@ TPrefsWindow::TPrefsWindow(BRect rect, BFont* font, int32* level, bool* wrap,
fAttachAttributesMenu); fAttachAttributesMenu);
add_menu_to_layout(menu, mailLayout, layoutRow); add_menu_to_layout(menu, mailLayout, layoutRow);
SetLayout(new BGroupLayout(B_HORIZONTAL)); BLayoutBuilder::Group<>(this, B_VERTICAL)
AddChild(BGroupLayoutBuilder(B_VERTICAL, kSpacing)
.Add(interfaceBox) .Add(interfaceBox)
.Add(mailBox) .Add(mailBox)
.Add(BGroupLayoutBuilder(B_HORIZONTAL, kSpacing) .AddGroup(B_HORIZONTAL, 0)
.Add(fRevert) .Add(fRevert)
.AddGlue() .AddGlue()
.Add(cancelButton) .Add(cancelButton)
.Add(okButton) .Add(okButton)
) .End()
.SetInsets(kSpacing, kSpacing, kSpacing, kSpacing) .SetInsets(B_USE_WINDOW_SPACING);
);
Show(); Show();
} }

14
src/apps/mediaconverter/MediaConverterWindow.cpp
View File

@ -274,16 +274,18 @@ MediaConverterWindow::MediaConverterWindow(BRect frame)
BLayoutBuilder::Group<>(this, B_VERTICAL, 0) BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
.SetInsets(0, 0, 0, 0) .SetInsets(0, 0, 0, 0)
.Add(fMenuBar) .Add(fMenuBar)
.AddSplit(B_HORIZONTAL, padding / 2) .AddSplit(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
.SetInsets(padding, padding, padding, padding) .SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
.Add(fSourcesBox, 0.4) B_USE_WINDOW_SPACING, 0)
.AddGroup(B_VERTICAL, padding, 0.6) .Add(fSourcesBox)
.AddGroup(B_VERTICAL, B_USE_ITEM_SPACING)
.Add(fInfoBox) .Add(fInfoBox)
.Add(fOutputBox) .Add(fOutputBox)
.End() .End()
.End() .End()
.AddGrid(padding, padding) .AddGrid(B_USE_ITEM_SPACING)
.SetInsets(padding, 0, padding, padding) .SetInsets(B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING,
B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING)
.Add(fStatus, 0, 0) .Add(fStatus, 0, 0)
.Add(fFileStatus, 0, 1) .Add(fFileStatus, 0, 1)
.Add(BSpaceLayoutItem::CreateGlue(), 1, 0) .Add(BSpaceLayoutItem::CreateGlue(), 1, 0)

13
src/preferences/backgrounds/BackgroundsView.cpp
View File

@ -222,21 +222,22 @@ BackgroundsView::BackgroundsView()
fApply->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT, fApply->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT,
B_ALIGN_NO_VERTICAL)); B_ALIGN_NO_VERTICAL));
AddChild(BLayoutBuilder::Group<>(B_VERTICAL) BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
.AddGroup(B_HORIZONTAL) .SetInsets(B_USE_WINDOW_SPACING)
.AddGroup(B_HORIZONTAL, 0)
.AddGroup(B_VERTICAL, 0) .AddGroup(B_VERTICAL, 0)
.AddStrut(floorf(rightbox->TopBorderOffset() .AddStrut(floorf(rightbox->TopBorderOffset()
- previewBox->TopBorderOffset()) - 1) - previewBox->TopBorderOffset()) - 1)
.Add(previewBox) .Add(previewBox)
.End() .End()
.AddStrut(B_USE_DEFAULT_SPACING)
.Add(rightbox) .Add(rightbox)
.End() .End()
.AddGroup(B_HORIZONTAL) .AddGroup(B_HORIZONTAL, 0)
.Add(fRevert) .Add(fRevert)
.Add(fApply) .Add(fApply)
.End() .SetInsets(0, B_USE_DEFAULT_SPACING, 0, 0)
.SetInsets(B_USE_DEFAULT_SPACING) .End();
.View());
fApply->MakeDefault(true); fApply->MakeDefault(true);
} }

24
src/preferences/bluetooth/BluetoothWindow.cpp
View File

@ -2,20 +2,21 @@
* Copyright 2008-10, Oliver Ruiz Dorantes, <oliver.ruiz.dorantes_at_gmail.com> * Copyright 2008-10, Oliver Ruiz Dorantes, <oliver.ruiz.dorantes_at_gmail.com>
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#include "BluetoothWindow.h"
#include "BluetoothWindow.h"
#include "RemoteDevicesView.h"
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <GroupLayoutBuilder.h> #include <LayoutBuilder.h>
#include <Messenger.h> #include <Messenger.h>
#include <SpaceLayoutItem.h>
#include <TabView.h>
#include <Roster.h> #include <Roster.h>
#include <TabView.h>
#include <stdio.h> #include <stdio.h>
#include <bluetooth/LocalDevice.h> #include <bluetooth/LocalDevice.h>
#include "RemoteDevicesView.h"
#include "defs.h" #include "defs.h"
@ -91,18 +92,17 @@ BluetoothWindow::BluetoothWindow(BRect frame)
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
.Add(fMenubar) .Add(fMenubar)
.Add(BSpaceLayoutItem::CreateVerticalStrut(5)) .AddStrut(B_USE_DEFAULT_SPACING)
.Add(tabView) .Add(tabView)
.Add(BSpaceLayoutItem::CreateVerticalStrut(5)) .AddStrut(B_USE_DEFAULT_SPACING)
.Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) .AddGroup(B_HORIZONTAL, 0)
.Add(fRevertButton) .Add(fRevertButton)
.AddGlue() .AddGlue()
.Add(fDefaultsButton) .Add(fDefaultsButton)
) .End()
.SetInsets(5, 5, 5, 5) .SetInsets(B_USE_WINDOW_SPACING);
);
} }

11
src/preferences/printers/AddPrinterDialog.cpp
View File

@ -15,10 +15,9 @@
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <GridLayout.h>
#include <GridLayoutBuilder.h>
#include <GroupLayoutBuilder.h> #include <GroupLayoutBuilder.h>
#include <Layout.h> #include <Layout.h>
#include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <MenuField.h> #include <MenuField.h>
#include <MenuItem.h> #include <MenuItem.h>
@ -207,9 +206,7 @@ AddPrinterDialog::_BuildGUI(int stage)
BButton *cancel = new BButton(NULL, B_TRANSLATE("Cancel"), BButton *cancel = new BButton(NULL, B_TRANSLATE("Cancel"),
new BMessage(B_CANCEL)); new BMessage(B_CANCEL));
SetLayout(new BGridLayout()); BLayoutBuilder::Grid<>(this, B_USE_ITEM_SPACING, B_USE_ITEM_SPACING)
AddChild(BGridLayoutBuilder(0, 4)
.Add(fName->CreateLabelLayoutItem(), 0, 0) .Add(fName->CreateLabelLayoutItem(), 0, 0)
.Add(fName->CreateTextViewLayoutItem(), 1, 0) .Add(fName->CreateTextViewLayoutItem(), 1, 0)
.Add(printerMenuField->CreateLabelLayoutItem(), 0, 1) .Add(printerMenuField->CreateLabelLayoutItem(), 0, 1)
@ -221,8 +218,8 @@ AddPrinterDialog::_BuildGUI(int stage)
.Add(cancel) .Add(cancel)
.Add(fOk) .Add(fOk)
, 0, 3, 2) , 0, 3, 2)
.SetInsets(8, 8, 8, 8) .SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
); B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING);
SetDefaultButton(fOk); SetDefaultButton(fOk);
fOk->MakeDefault(true); fOk->MakeDefault(true);