From aaa7d92685de060c2e8143e06408f1a3c716a0b0 Mon Sep 17 00:00:00 2001
From: Janus <janus2@ymail.com>
Date: Tue, 21 Apr 2015 18:25:43 +0000
Subject: [PATCH] Preferences: improve layout.

* Sounds use LayoutBuilder vs. GroupLayoutBuilder.
* Time standard spacing.
* VirtualMemory standard spacing.
---
 src/preferences/sounds/HWindow.cpp               | 13 ++++---------
 src/preferences/time/TimeWindow.cpp              |  7 +++----
 src/preferences/virtualmemory/SettingsWindow.cpp | 12 ++++++------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/preferences/sounds/HWindow.cpp b/src/preferences/sounds/HWindow.cpp
index 6fba4171ee..23bfcb2af4 100644
--- a/src/preferences/sounds/HWindow.cpp
+++ b/src/preferences/sounds/HWindow.cpp
@@ -23,7 +23,7 @@
 #include <ControlLook.h>
 #include <FindDirectory.h>
 #include <fs_attr.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <MediaFiles.h>
 #include <MenuBar.h>
@@ -312,21 +312,16 @@ HWindow::_InitGUI()
 	playbutton->SetEnabled(false);
 	playbutton->SetExplicitSize(buttonsSize);
 
-	const float kInset = be_control_look->DefaultItemSpacing();
-
-	SetLayout(new BGroupLayout(B_HORIZONTAL));
-	AddChild(BGroupLayoutBuilder(B_VERTICAL)
-		.SetInsets(kInset, kInset, kInset, kInset)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fEventList)
 		.AddGroup(B_HORIZONTAL)
-			.SetInsets(0, 0, 0, 0)
 			.Add(menuField)
 			.AddGroup(B_HORIZONTAL, 0)
 				.Add(playbutton)
 				.Add(stopbutton)
 			.End()
-		.End()
-	);
+		.End();
 
 	// setup file menu
 	_SetupMenuField();
diff --git a/src/preferences/time/TimeWindow.cpp b/src/preferences/time/TimeWindow.cpp
index fe5821bf81..f3545892d2 100644
--- a/src/preferences/time/TimeWindow.cpp
+++ b/src/preferences/time/TimeWindow.cpp
@@ -139,11 +139,10 @@ TTimeWindow::_InitWindow()
 	fRevertButton->SetExplicitAlignment(
 		BAlignment(B_ALIGN_LEFT, B_ALIGN_MIDDLE));
 
-	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fBaseView)
-		.Add(fRevertButton)
-		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
-			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING);
+		.Add(fRevertButton);
 }
 
 
diff --git a/src/preferences/virtualmemory/SettingsWindow.cpp b/src/preferences/virtualmemory/SettingsWindow.cpp
index 508cf46060..c1623915dd 100644
--- a/src/preferences/virtualmemory/SettingsWindow.cpp
+++ b/src/preferences/virtualmemory/SettingsWindow.cpp
@@ -196,13 +196,13 @@ SettingsWindow::SettingsWindow()
 	BBox* box = new BBox("box");
 	box->SetLabel(fSwapEnabledCheckBox);
 
-	box->AddChild(BLayoutBuilder::Group<>(B_VERTICAL, B_USE_DEFAULT_SPACING)
+	box->AddChild(BLayoutBuilder::Group<>(B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fSwapUsageBar)
 		.Add(fSwapAutomaticCheckBox)
 		.Add(fVolumeMenuField)
 		.Add(fSizeSlider)
 		.Add(fWarningStringView)
-		.SetInsets(10)
 		.View());
 
 	fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"),
@@ -212,14 +212,14 @@ SettingsWindow::SettingsWindow()
 		new BMessage(kMsgRevert));
 	fRevertButton->SetEnabled(false);
 
-	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(box)
-		.AddGroup(B_HORIZONTAL, 10)
+		.AddGroup(B_HORIZONTAL)
 			.Add(fDefaultsButton)
 			.Add(fRevertButton)
 			.AddGlue()
-		.End()
-		.SetInsets(10);
+		.End();
 
 	BScreen screen;
 	BRect screenFrame = screen.Frame();