diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-06-29 22:35:52 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-06-29 22:35:52 +0100 |
| commit | 0c5bb37bea878d6b0b622cb7ea6eab649e4c578b (patch) | |
| tree | e0bc56870460a4cd8784ae75502e1e9ac06376c5 /amiga/menu.c | |
| parent | dfc095bd900b37fb7e1ddb25fd2a85bf1839e41c (diff) | |
| download | netsurf-0c5bb37bea878d6b0b622cb7ea6eab649e4c578b.tar.gz netsurf-0c5bb37bea878d6b0b622cb7ea6eab649e4c578b.tar.bz2 | |
Implement a very basic favicon cache for the hotlist menu to use
Diffstat (limited to 'amiga/menu.c')
| -rw-r--r-- | amiga/menu.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index 43c8c188b..c6258be6f 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -405,6 +405,13 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) BITMAP_SourceFile, gwin->menuicon[i], BITMAP_Masking, TRUE, BitMapEnd; + + /* \todo make this scale the bitmap to these dimensions */ + SetAttrs(icon, + BITMAP_Width, 16, + BITMAP_Height, 16, + TAG_DONE); + GetAttr(IA_Width, icon, (ULONG *)&icon_width); if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { @@ -551,7 +558,7 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin) static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char *title, nsurl *url, bool is_folder) { UBYTE type; - char *icon; + STRPTR icon; struct gui_window_2 *gw = (struct gui_window_2 *)userdata; if(item >= AMI_MENU_HOTLIST_MAX) return false; @@ -570,9 +577,10 @@ static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char } if(is_folder == true) { - icon = "icons/directory.png"; + icon = ASPrintf("icons/directory.png"); } else { - icon = "icons/content.png"; + icon = ami_gui_get_cache_favicon_name(url, true); + if (icon == NULL) icon = ASPrintf("icons/content.png"); } ami_menu_alloc_item(gw, item, type, title, @@ -580,6 +588,8 @@ static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char if((is_folder == true) && (type == NM_SUB)) gw->menu[item].nm_Flags = NM_ITEMDISABLED; + if(icon) FreeVec(icon); + return true; } |