From 83cc66b38fd4c5ec0eb474b2807d2d6d06a1fec9 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Thu, 30 May 2013 22:10:40 -0400
Subject: [PATCH] Revert to manually offsetting the BBox in BScreen.

Take this opportunity to reapply this hack in a much nicer way.

Before the hack included the default margins, now it doesn't.

Should be back to normal, sorry for the noise.
---
 src/preferences/screen/ScreenWindow.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 0591f469ce..250766d3de 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -506,16 +506,18 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
 	fRevertButton->SetEnabled(false);
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
-		.AddGroup(B_VERTICAL, B_USE_DEFAULT_SPACING)
-			.AddGroup(B_HORIZONTAL)
+		.AddGroup(B_HORIZONTAL)
+			.AddGroup(B_VERTICAL, 0)
+				.AddStrut(floorf(controlsBox->TopBorderOffset()) - 1)
 				.Add(screenBox)
-				.Add(controlsBox)
 				.End()
-			.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
-				.Add(fRevertButton)
-				.AddGlue()
-				.End()
-			.SetInsets(B_USE_DEFAULT_SPACING);
+			.Add(controlsBox)
+			.End()
+		.AddGroup(B_HORIZONTAL, B_USE_DEFAULT_SPACING)
+			.Add(fRevertButton)
+			.AddGlue()
+			.End()
+		.SetInsets(B_USE_DEFAULT_SPACING);
 
 	_UpdateControls();
 	_UpdateMonitor();