From 24e5b2ec167b0e9a751c3b7a01f6ddae4ffd0e49 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 24 Nov 2013 14:37:44 +0000
Subject: [PATCH] Create a layout group for favicon, URL and the new favourites
 star. This makes the balance bar work again.

---
 amiga/gui.c | 58 +++++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/amiga/gui.c b/amiga/gui.c
index cd89b7ae4..c28ea583f 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3511,35 +3511,37 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 					ButtonEnd,
 					CHILD_WeightedWidth,0,
 					CHILD_WeightedHeight,0,
-					LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObject,
-						GA_ID, GID_ICON,
-						SPACE_MinWidth, 16,
-						SPACE_MinHeight, 16,
-						SPACE_Transparent, FALSE,
-					//	SPACE_RenderHook, &g->shared->favicon_hook,
-					SpaceEnd,
-					CHILD_WeightedWidth,0,
-					CHILD_WeightedHeight,0,
-					LAYOUT_AddChild, g->shared->objects[GID_URL] =
-						NewObject(urlStringClass, NULL,
-								STRINGA_MaxChars, 2000,
-								GA_ID, GID_URL,
-								GA_RelVerify, TRUE,
-								GA_HintInfo, g->shared->helphints[GID_URL],
-								GA_TabCycle, TRUE,
-								STRINGA_Buffer, g->shared->svbuffer,
-								STRINGVIEW_Header, URLHistory_GetList(),
-              			StringEnd,
+					LAYOUT_AddChild, HGroupObject, // FavIcon, URL bar and hotlist star
+						LAYOUT_VertAlignment, LALIGN_CENTER,
+						LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObject,
+							GA_ID, GID_ICON,
+							SPACE_MinWidth, 16,
+							SPACE_MinHeight, 16,
+							SPACE_Transparent, FALSE,
+						//	SPACE_RenderHook, &g->shared->favicon_hook,
+						SpaceEnd,
+						CHILD_WeightedWidth, 0,
+						CHILD_WeightedHeight, 0,
+						LAYOUT_AddChild, g->shared->objects[GID_URL] =
+							NewObject(urlStringClass, NULL,
+									STRINGA_MaxChars, 2000,
+									GA_ID, GID_URL,
+									GA_RelVerify, TRUE,
+									GA_HintInfo, g->shared->helphints[GID_URL],
+									GA_TabCycle, TRUE,
+									STRINGA_Buffer, g->shared->svbuffer,
+									STRINGVIEW_Header, URLHistory_GetList(),
+							StringEnd,
 
-					LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObject,
-						GA_ID, GID_FAVE,
-						GA_RelVerify, TRUE,
-					//	GA_HintInfo, g->shared->helphints[GID_FAVE],
-						BUTTON_RenderImage, g->shared->objects[GID_FAVE_ADD],
-					ButtonEnd,
-					CHILD_WeightedWidth,0,
-					CHILD_WeightedHeight,0,
-						
+						LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObject,
+							GA_ID, GID_FAVE,
+							GA_RelVerify, TRUE,
+						//	GA_HintInfo, g->shared->helphints[GID_FAVE],
+							BUTTON_RenderImage, g->shared->objects[GID_FAVE_ADD],
+						ButtonEnd,
+						CHILD_WeightedWidth, 0,
+						CHILD_WeightedHeight, 0,
+					LayoutEnd,
 				//	GA_ID, GID_TOOLBARLAYOUT,
 				//	GA_RelVerify, TRUE,
 				//	LAYOUT_RelVerify, TRUE,