Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1200fedb1c42839da1791... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1200fedb1c42839da1791c5... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1200fedb1c42839da1791c5c4... The branch, master has been updated via 1200fedb1c42839da1791c5c46d881a02a47b9c0 (commit) via 0dea8112d444a711e6d1e3914d6956e752ac1089 (commit) from 889ee3108c8c2b1c6f6bf06bb50d47cb177ad14a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1200fedb1c42839da17... commit 1200fedb1c42839da1791c5c46d881a02a47b9c0 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Enable alpha bitmaps in chooser.gadget on OS4.1FE diff --git a/amiga/gui.c b/amiga/gui.c index 1fdb6e7..e6487ea 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 4752e91..f0667b5 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 commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0dea8112d444a711e6d... commit 0dea8112d444a711e6d1e3914d6956e752ac1089 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Erase favicon area before redrawing diff --git a/amiga/gui.c b/amiga/gui.c index 608d6bf..1fdb6e7 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1691,6 +1691,10 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) warn_user("NoMemory", ""); return; } + + EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top, + bbox->Left + 16, bbox->Top + 16); + #ifdef __amigaos4__ BltBitMapTags(BLITA_SrcX, 0, BLITA_SrcY, 0, ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 14 ++++++++++++++ amiga/os3support.h | 1 + 2 files changed, 15 insertions(+) diff --git a/amiga/gui.c b/amiga/gui.c index 608d6bf..e6487ea 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> @@ -1691,6 +1692,10 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) warn_user("NoMemory", ""); return; } + + EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top, + bbox->Left + 16, bbox->Top + 16); + #ifdef __amigaos4__ BltBitMapTags(BLITA_SrcX, 0, BLITA_SrcY, 0, @@ -4961,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 4752e91..f0667b5 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 -- NetSurf Browser