From 37da7b7dce5457cb897895fcbeae3812891510b3 Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Thu, 12 Apr 2012 04:58:42 -0400
Subject: [PATCH] Some Layout fixed to 3dRendering for different font sizes.

Add glue between the gears view and the rest to make sure that
the rest butts up against GearsView. Update the Preferred
and Max size so that the spacing is appropriate. Make the window
width smaller and allow the views to expand it.

The ColumnListViews are still not set to respect different font
sizes but overall it works better at smaller font sizes.
---
 src/preferences/3drendering/CapabilitiesView.cpp | 2 +-
 src/preferences/3drendering/ExtensionsView.cpp   | 2 +-
 src/preferences/3drendering/GearsView.cpp        | 3 ++-
 src/preferences/3drendering/OpenGLView.cpp       | 1 +
 src/preferences/3drendering/OpenGLWindow.cpp     | 3 ++-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/preferences/3drendering/CapabilitiesView.cpp b/src/preferences/3drendering/CapabilitiesView.cpp
index abc6038e0d..7d3d5a637a 100644
--- a/src/preferences/3drendering/CapabilitiesView.cpp
+++ b/src/preferences/3drendering/CapabilitiesView.cpp
@@ -31,7 +31,7 @@
 CapabilitiesView::CapabilitiesView()
 	:
 	BGroupView(B_TRANSLATE("Capabilities"), B_VERTICAL),
-	fCapabilitiesList(new BColumnListView("CapabilitiesList", B_FOLLOW_ALL))
+	fCapabilitiesList(new BColumnListView("CapabilitiesList", 0))
 {
 	// add the columns
 
diff --git a/src/preferences/3drendering/ExtensionsView.cpp b/src/preferences/3drendering/ExtensionsView.cpp
index 4becba91c6..36bcba639d 100644
--- a/src/preferences/3drendering/ExtensionsView.cpp
+++ b/src/preferences/3drendering/ExtensionsView.cpp
@@ -29,7 +29,7 @@
 ExtensionsView::ExtensionsView()
 	:
 	BGroupView(B_TRANSLATE("Extensions"), B_VERTICAL),
-	fExtensionsList(new BColumnListView("ExtensionsList", B_FOLLOW_ALL))
+	fExtensionsList(new BColumnListView("ExtensionsList", 0))
 {
 	// add the columns
 
diff --git a/src/preferences/3drendering/GearsView.cpp b/src/preferences/3drendering/GearsView.cpp
index 39a1a2c2d3..f5e44bc37c 100644
--- a/src/preferences/3drendering/GearsView.cpp
+++ b/src/preferences/3drendering/GearsView.cpp
@@ -23,7 +23,8 @@ GearsView::GearsView()
 	BView("GearsView", B_WILL_DRAW),
 	fGears(NULL)
 {
-	SetExplicitPreferredSize(BSize(64.0 + 5.0, B_SIZE_UNLIMITED));
+	SetExplicitMinSize(BSize(64.0 + 10.0, B_SIZE_UNSET));
+	SetExplicitPreferredSize(BSize(64.0 + 10.0, B_SIZE_UNLIMITED));
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 	_InitGearsBitmap();
 }
diff --git a/src/preferences/3drendering/OpenGLView.cpp b/src/preferences/3drendering/OpenGLView.cpp
index 5db0c4b92e..46d36660d1 100644
--- a/src/preferences/3drendering/OpenGLView.cpp
+++ b/src/preferences/3drendering/OpenGLView.cpp
@@ -76,6 +76,7 @@ OpenGLView::OpenGLView()
 				.Add(menuField)
 				.Add(tabView)
 				.End()
+			.AddGlue()
 			.End();
 }
 
diff --git a/src/preferences/3drendering/OpenGLWindow.cpp b/src/preferences/3drendering/OpenGLWindow.cpp
index ca16a963b5..00cfffdc40 100644
--- a/src/preferences/3drendering/OpenGLWindow.cpp
+++ b/src/preferences/3drendering/OpenGLWindow.cpp
@@ -13,6 +13,7 @@
 #include <Application.h>
 #include <Catalog.h>
 #include <GroupLayout.h>
+
 #include "OpenGLView.h"
 
 
@@ -22,7 +23,7 @@
 
 OpenGLWindow::OpenGLWindow()
 	:
-	BWindow(BRect(50, 50, 450 + 64, 300),
+	BWindow(BRect(50, 50, 300, 300),
 		B_TRANSLATE_SYSTEM_NAME("3D Rendering"), B_TITLED_WINDOW,
 		B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
 		| B_AUTO_UPDATE_SIZE_LIMITS)