Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7716143240429371e8f357ddc44d15d343759ae1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7716143240429371e8f357ddc44d15d343759ae1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7716143240429371e8f357ddc44d15d343759ae1
The branch, master has been updated
via 7716143240429371e8f357ddc44d15d343759ae1 (commit)
via 1e02eba1932b1fa2eff148ed6e9b58170a74189e (commit)
via 97aabaf49dc587345f40b1ab8e908fdc6dcfae0f (commit)
via 28ddb102687dc570f94a2f2157c80a279bf99274 (commit)
from f5891097cc955e05946f114a7e28b36f61faddf1 (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/commitdiff/7716143240429371e8f357ddc44d15d343759ae1
commit 7716143240429371e8f357ddc44d15d343759ae1
Merge: 1e02eba f589109
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/1e02eba1932b1fa2eff148ed6e9b58170a74189e
commit 1e02eba1932b1fa2eff148ed6e9b58170a74189e
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
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.
diff --git a/amiga/gui.c b/amiga/gui.c
index d5d227e..6fc8a29 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)
{
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/97aabaf49dc587345f40b1ab8e908fdc6dcfae0f
commit 97aabaf49dc587345f40b1ab8e908fdc6dcfae0f
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Test for opaqueness where we create bitmaps in the platform code
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index bf32a2f..ce665aa 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 15ae40d..b6e0a91 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;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/28ddb102687dc570f94a2f2157c80a279bf99274
commit 28ddb102687dc570f94a2f2157c80a279bf99274
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix opaqueness test: the alpha channel is the first byte, not the last.
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 4e1057e..bf32a2f 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -208,7 +208,7 @@ bool bitmap_test_opaque(void *bitmap)
for(a=0;a<p;a+=4)
{
- if ((*bmi & 0x000000ffU) != 0x000000ffU) return false;
+ if ((*bmi & 0xff000000U) != 0xff000000U) return false;
bmi++;
}
return true;
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 4 +++-
amiga/dt_picture.c | 2 ++
amiga/gui.c | 8 ++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 4e1057e..ce665aa 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -208,7 +208,7 @@ bool bitmap_test_opaque(void *bitmap)
for(a=0;a<p;a+=4)
{
- if ((*bmi & 0x000000ffU) != 0x000000ffU) return false;
+ if ((*bmi & 0xff000000U) != 0xff000000U) return false;
bmi++;
}
return true;
@@ -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 15ae40d..b6e0a91 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;
diff --git a/amiga/gui.c b/amiga/gui.c
index d5d227e..6fc8a29 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)
{
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
