From 026fe75255ff6ac8500e6473b56612b6f92207e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= <jonas@kirilla.com>
Date: Sun, 4 Oct 2009 15:15:03 +0000
Subject: [PATCH] Fix bug in order of count entry fields. Change to 2x2 grid
 view.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33420 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/deskbar/PreferencesWindow.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp
index 65c3dde483..551b590206 100644
--- a/src/apps/deskbar/PreferencesWindow.cpp
+++ b/src/apps/deskbar/PreferencesWindow.cpp
@@ -193,13 +193,14 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 					.End()
 				.AddGroup(B_VERTICAL, 0)
 					.Add(fMenuRecentDocumentCount)
-					.Add(fMenuRecentApplicationCount)
 					.Add(fMenuRecentFolderCount)
+					.Add(fMenuRecentApplicationCount)
 					.End()
 				.End()
 			.Add(new BButton("Edit Menu" B_UTF8_ELLIPSIS,
 				new BMessage(kEditMenuInTracker)))
-			.SetInsets(5, 5, 5, 5)
+			.AddGlue()
+			.SetInsets(10, 10, 10, 10)
 			.End()
 		.View();
 	fMenuBox->AddChild(view);
@@ -213,7 +214,8 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 				.SetInsets(20, 0, 0, 0)
 				.Add(fAppsExpandNew)
 				.End()
-			.SetInsets(5, 5, 5, 5)
+			.AddGlue()
+			.SetInsets(10, 10, 10, 10)
 			.End()
 		.View();
 	fAppsBox->AddChild(view);
@@ -224,7 +226,8 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 			.Add(fClockSeconds)
 			.Add(fClockEuropeanDate)
 			.Add(fClockFullDate)
-			.SetInsets(5, 5, 5, 5)
+			.AddGlue()
+			.SetInsets(10, 10, 10, 10)
 			.End()
 		.View();
 	fClockBox->AddChild(view);
@@ -234,17 +237,17 @@ PreferencesWindow::PreferencesWindow(BRect frame)
 			.Add(fWindowAlwaysOnTop)
 			.Add(fWindowAutoRaise)
 			.AddGlue()
-			.SetInsets(5, 5, 5, 5)
+			.SetInsets(10, 10, 10, 10)
 			.End()
 		.View();
 	fWindowBox->AddChild(view);
 
 	BLayoutBuilder::Group<>(this)
-		.AddGroup(B_VERTICAL, 1)
-			.Add(fMenuBox)
-			.Add(fWindowBox)
-			.Add(fAppsBox)
-			.Add(fClockBox)
+		.AddGrid(5, 5)
+			.Add(fMenuBox, 0, 0)
+			.Add(fWindowBox, 1, 0)
+			.Add(fAppsBox, 0, 1)
+			.Add(fClockBox, 1, 1)
 			.SetInsets(10, 10, 10, 10)
 			.End()
 		.End();