From f9ed0af8d8551ede4100566f2d49494d68a4c0d6 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 25 Oct 2014 13:17:49 +0100
Subject: Remove built-in window scrollbar and replace with a scroller.gadget.
 The style does not match the window border so looks a bit odd.

---
 amiga/gui.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 587c285f6..2a0fd2242 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -61,6 +61,7 @@
 #include <proto/chooser.h>
 #include <proto/clicktab.h>
 #include <proto/layout.h>
+#include <proto/scroller.h>
 #include <proto/space.h>
 #include <proto/speedbar.h>
 #include <proto/string.h>
@@ -3447,7 +3448,7 @@ gui_window_create(struct browser_window *bw,
 			WINDOW_IconifyGadget, iconifygadget,
 			WINDOW_NewMenu, g->shared->menu,
 			WINDOW_MenuUserData, WGUD_HOOK,
-			WINDOW_VertProp, 1,
+			//WINDOW_VertProp, 1,
 			WINDOW_NewPrefsHook, &newprefs_hook,
 			WINDOW_IDCMPHook, &g->shared->scrollerhook,
 			WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_REFRESHWINDOW |
@@ -3619,10 +3620,17 @@ gui_window_create(struct browser_window *bw,
 					CHILD_WeightedHeight,0,
 				LayoutEnd,
 				CHILD_WeightedHeight,0,
-				LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObject,
-					GA_ID,GID_BROWSER,
-					SPACE_Transparent,TRUE,
-				SpaceEnd,
+				LAYOUT_AddChild, HGroupObject,
+					LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObject,
+						GA_ID,GID_BROWSER,
+						SPACE_Transparent,TRUE,
+					SpaceEnd,
+					LAYOUT_AddChild, g->shared->objects[OID_VSCROLL] = ScrollerObject,
+						GA_ID, OID_VSCROLL,
+						GA_RightBorder, TRUE,
+						GA_RelVerify, TRUE,
+					ScrollerEnd,
+				EndGroup,
 			EndGroup,
 		EndWindow;
 	}
@@ -3682,8 +3690,8 @@ gui_window_create(struct browser_window *bw,
 		return NULL;
 	}
 
-	GetAttr(WINDOW_VertObject, g->shared->objects[OID_MAIN],
-			(ULONG *)&g->shared->objects[OID_VSCROLL]);
+//	GetAttr(WINDOW_VertObject, g->shared->objects[OID_MAIN],
+//			(ULONG *)&g->shared->objects[OID_VSCROLL]);
 
 	RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[OID_VSCROLL],
 			g->shared->win, NULL,
-- 
cgit v1.2.3