From 1200fedb1c42839da1791c5c46d881a02a47b9c0 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 31 Jan 2015 12:59:49 +0000
Subject: Enable alpha bitmaps in chooser.gadget on OS4.1FE

---
 amiga/gui.c        | 10 ++++++++++
 amiga/os3support.h |  1 +
 2 files changed, 11 insertions(+)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 1fdb6e7c7..e6487ea3d 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -43,6 +43,7 @@
 /* Other OS includes */
 #include <datatypes/textclass.h>
 #include <devices/inputevent.h>
+#include <graphics/gfxbase.h>
 #include <graphics/rpattr.h>
 #ifdef __amigaos4__
 #include <graphics/blitattr.h>
@@ -4965,11 +4966,20 @@ static nserror gui_search_web_provider_update(const char *provider_name,
 			if(gwin->search_bm != NULL)
 				DisposeObject(gwin->search_bm);
 
+			ULONG bm_masking_tag = TAG_IGNORE;
+
+			if(GfxBase->LibNode.lib_Version >= 54) {	/* chooser 53.21, but check gfx.lib
+													 *                is FE as it's easier */
+				bm_masking_tag = BITMAP_Masking;
+			}
+
 			gwin->search_bm = BitMapObj,
 						BITMAP_Screen, scrn,
 						BITMAP_Width, 16,
 						BITMAP_Height, 16,
 						BITMAP_BitMap, bm,
+						BITMAP_HasAlpha, TRUE,
+						bm_masking_tag, TRUE,
 					BitMapEnd;
 
 			RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON],
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 4752e9109..f0667b55f 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -62,6 +62,7 @@
 /* Ignore unsupported tags */
 #define ASO_NoTrack				TAG_IGNORE
 #define BITMAP_DisabledSourceFile	TAG_IGNORE
+#define BITMAP_HasAlpha			TAG_IGNORE
 #define BLITA_UseSrcAlpha		TAG_IGNORE
 #define BLITA_MaskPlane			TAG_IGNORE
 #define CLICKTAB_CloseImage		TAG_IGNORE
-- 
cgit v1.2.3