diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-18 15:13:18 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-18 15:13:18 +0000 |
| commit | 52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d (patch) | |
| tree | 1b40793d23e4ff0d44fd8a00ceed77aa4b842fad /amiga/menu.c | |
| parent | 1139f0e907af889815cb39cab4b1f7bb770b2871 (diff) | |
| download | netsurf-52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d.tar.gz netsurf-52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d.tar.bz2 | |
Folders in the Hotlist menu hierarchy with no child nodes will now be disabled in the
menu. Items named "--" will be converted to NM_BARLABEL.
svn path=/trunk/netsurf/; revision=5595
Diffstat (limited to 'amiga/menu.c')
| -rwxr-xr-x | amiga/menu.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index 8d87e77b0..055bf7652 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -222,12 +222,21 @@ void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen,ULONG *item,s if(*gen == 2) menu[*item].nm_Type = NM_ITEM; if(*gen == 3) menu[*item].nm_Type = NM_SUB; - menulab[*item] = ami_utf8_easy(element->text); + if(strcmp(element->text,"--")) + { + menulab[*item] = ami_utf8_easy(element->text); + } + else + { + menulab[*item] = NM_BARLABEL; + } + menu[*item].nm_Label = menulab[*item]; element = tree_find_element(node, TREE_ELEMENT_URL); - if(element && element->text) - menu[*item].nm_UserData = element->text; + if(element && element->text) menu[*item].nm_UserData = element->text; + + if(node->folder && (!node->child)) menu[*item].nm_Flags = NM_ITEMDISABLED; *item = *item + 1; } |