From 3e2123d9ec06ad7102ed32847755358ef43a84c2 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 5 Aug 2012 10:16:37 +0100 Subject: Need libdom, libpbl when cross compiling. --- amiga/Makefile.target | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'amiga') diff --git a/amiga/Makefile.target b/amiga/Makefile.target index fb0259c59..f2d23bbc0 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -52,16 +52,16 @@ else CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags libxml-2.0 libcurl libcares openssl) - CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libhubbub libcss) + CFLAGS += $(shell $(PKG_CONFIG) --cflags tre libdom libcss) LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libcares openssl) - LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libhubbub libcss) + LDFLAGS += $(shell $(PKG_CONFIG) --libs tre libdom libcss) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib ifeq ($(SUBTARGET),os3) LDFLAGS += -liconv else - LDFLAGS += -lauto + LDFLAGS += -lauto -lpbl endif EXETARGET := NetSurf -- cgit v1.2.3 From 28ddb102687dc570f94a2f2157c80a279bf99274 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 5 Aug 2012 13:50:14 +0100 Subject: Fix opaqueness test: the alpha channel is the first byte, not the last. --- amiga/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'amiga') diff --git a/amiga/bitmap.c b/amiga/bitmap.c index 4e1057eb6..bf32a2ffd 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -208,7 +208,7 @@ bool bitmap_test_opaque(void *bitmap) for(a=0;a Date: Sun, 5 Aug 2012 14:02:32 +0100 Subject: Test for opaqueness where we create bitmaps in the platform code --- amiga/bitmap.c | 2 ++ amiga/dt_picture.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'amiga') diff --git a/amiga/bitmap.c b/amiga/bitmap.c index bf32a2ffd..ce665aaf7 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -328,6 +328,8 @@ struct bitmap *ami_bitmap_from_datatype(char *filename) IDoMethod(dto, PDTM_READPIXELARRAY, bitmap_get_buffer(bm), PBPAFMT_RGBA, bitmap_get_rowstride(bm), 0, 0, bmh->bmh_Width, bmh->bmh_Height); + + bitmap_set_opaque(bm, bitmap_test_opaque(bm)); } DisposeDTObject(dto); } diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index 15ae40dae..b6e0a91b7 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -159,6 +159,8 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) bm_buffer, bm_format, bitmap_get_rowstride(bitmap), 0, 0, c->width, c->height); + bitmap_set_opaque(bitmap, bitmap_test_opaque(bitmap)); + DisposeDTObject(dto); } else return NULL; -- cgit v1.2.3 From 1e02eba1932b1fa2eff148ed6e9b58170a74189e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 5 Aug 2012 14:26:41 +0100 Subject: Ask GID_ICON to redraw itself before we draw over the top of it. Unfortunately it redraws itself as a grey box, rather than the underlying window's backfill hook. --- amiga/gui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'amiga') diff --git a/amiga/gui.c b/amiga/gui.c index d5d227eef..6fc8a2991 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2821,7 +2821,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, - SPACE_Transparent, TRUE, + SPACE_Transparent, FALSE, // SPACE_RenderHook, &g->shared->favicon_hook, SpaceEnd, CHILD_WeightedWidth,0, @@ -2847,7 +2847,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GA_ID, GID_SEARCH_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, - SPACE_Transparent, TRUE, + SPACE_Transparent, FALSE, SPACE_RenderHook, &g->shared->search_ico_hook, SpaceEnd, CHILD_WeightedWidth,0, @@ -3823,8 +3823,8 @@ void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) { GetAttr(SPACE_AreaBox, g->shared->objects[GID_ICON], (ULONG *)&bbox); - EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top, - bbox->Left+16, bbox->Top+16); + RefreshGList((struct Gadget *)g->shared->objects[GID_ICON], + g->shared->win, NULL, 1); if(bm) { -- cgit v1.2.3