From 4666484ff2f0e66139d9463df626e3bb72b619ae Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Thu, 30 May 2013 20:39:23 -0400
Subject: [PATCH] Screen: Undo hack to line up the top borders of the BBox's

Also, use font relative spacing units
---
 src/preferences/screen/ScreenWindow.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 274393acd4..0591f469ce 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -505,18 +505,17 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
 		new BMessage(BUTTON_REVERT_MSG));
 	fRevertButton->SetEnabled(false);
 
-	BLayoutBuilder::Group<>(this, B_VERTICAL, 10.0)
-		.SetInsets(10, 10, 10, 10)
-		.AddGroup(B_HORIZONTAL, 10.0)
-			.AddGroup(B_VERTICAL)
-				.AddStrut(floor(controlsBox->TopBorderOffset() / 16) - 1)
+	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
+		.AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING)
+			.AddGroup(B_HORIZONTAL)
 				.Add(screenBox)
-			.End()
-			.Add(controlsBox)
-		.End()
-		.AddGroup(B_HORIZONTAL, 10.0)
-			.Add(fRevertButton)
-			.AddGlue();
+				.Add(controlsBox)
+				.End()
+			.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
+				.Add(fRevertButton)
+				.AddGlue()
+				.End()
+			.SetInsets(B_USE_DEFAULT_SPACING);
 
 	_UpdateControls();
 	_UpdateMonitor();