From 413c3803c50b29854fff1003e585ee7dfea3fa36 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Fri, 22 May 2020 23:10:23 +0100
Subject: Amiga: simplify page info GUI, add close gadget

---
 frontends/amiga/pageinfo.c | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'frontends/amiga')

diff --git a/frontends/amiga/pageinfo.c b/frontends/amiga/pageinfo.c
index 9a2b04910..898cb0653 100644
--- a/frontends/amiga/pageinfo.c
+++ b/frontends/amiga/pageinfo.c
@@ -179,7 +179,7 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win)
        	WA_Activate, TRUE,
        	WA_DepthGadget, TRUE,
        	WA_DragBar, TRUE,
-       	WA_CloseGadget, FALSE,
+       	WA_CloseGadget, TRUE,
        	WA_SizeGadget, TRUE,
 		WA_SizeBBottom, TRUE,
 		WA_Height, scrn->Height / 2,
@@ -193,32 +193,18 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win)
 		WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE |
 				IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW,
 		WINDOW_SharedPort, ami_gui_get_shared_msgport(),
+		WINDOW_HorizProp, 1,
+		WINDOW_VertProp, 1,
 		WINDOW_UserData, pageinfo_win,
 		WINDOW_IconifyGadget, FALSE,
 		WINDOW_Position, WPOS_CENTERSCREEN,
 		WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
-			LAYOUT_AddChild, ami_cw->objects[GID_CW_HSCROLLLAYOUT] = LayoutVObj,
-				LAYOUT_AddChild, ami_cw->objects[GID_CW_VSCROLLLAYOUT] = LayoutHObj,
-					LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
-						GA_ID, GID_CW_DRAW,
-						SPACE_Transparent, TRUE,
-						SPACE_BevelStyle, BVS_DISPLAY,
-						GA_RelVerify, TRUE,
-		   			SpaceEnd,
-					LAYOUT_AddChild, ami_cw->objects[GID_CW_VSCROLL] = ScrollerObj,
-						GA_ID, GID_CW_VSCROLL,
-						GA_RelVerify, TRUE,
-						ICA_TARGET, ICTARGET_IDCMP,
-		   			ScrollerEnd,
-				LayoutEnd,
-				LAYOUT_AddChild, ami_cw->objects[GID_CW_HSCROLL] = ScrollerObj,
-					GA_ID, GID_CW_HSCROLL,
-					GA_RelVerify, TRUE,
-					ICA_TARGET, ICTARGET_IDCMP,
-					SCROLLER_Orientation, SORIENT_HORIZ,
-	   			ScrollerEnd,
-			LayoutEnd,
-			CHILD_WeightedHeight, 0,
+			LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+				GA_ID, GID_CW_DRAW,
+				SPACE_Transparent, TRUE,
+				SPACE_BevelStyle, BVS_DISPLAY,
+				GA_RelVerify, TRUE,
+   			SpaceEnd,
 		EndGroup,
 	EndWindow;
 
-- 
cgit v1.2.3