diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-07-01 18:29:10 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-07-01 18:29:10 +0100 |
| commit | 291f1094eb871874bf2e01579522d9fbefde0ee8 (patch) | |
| tree | 1a7d0959a55014b411a03faff9e630e18089b19a | |
| parent | 06eb81235d975bc7721719d25ac114b4ab2c94da (diff) | |
| download | netsurf-291f1094eb871874bf2e01579522d9fbefde0ee8.tar.gz netsurf-291f1094eb871874bf2e01579522d9fbefde0ee8.tar.bz2 | |
Add some space between icon and text in the menu
| -rw-r--r-- | amiga/menu.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index 784fec163..7568a7d2f 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -362,9 +362,11 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) { int i, j; int txtlen = 0; + int left_posn; struct RastPort *rp = &scrn->RastPort; struct DrawInfo *dri = GetScreenDrawInfo(scrn); - + int space_width = TextLength(rp, " ", 1); + if(menu_glyphs_loaded == false) ami_menu_load_glyphs(dri); @@ -378,6 +380,8 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) if(gwin->menulab[j] != NM_BARLABEL) { if(gwin->menutype[j] == NM_ITEM) { item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j])); + item_size += space_width; + if(gwin->menukey[j]) { item_size += TextLength(rp, &gwin->menukey[j], 1); item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; @@ -413,13 +417,17 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) TAG_DONE); GetAttr(IA_Width, icon, (ULONG *)&icon_width); - + if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { + left_posn = txtlen - + TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - + menu_glyph_width[NSA_GLYPH_SUBMENU] - + icon_width - space_width; + submenuarrow = NewObject(NULL, "sysiclass", - SYSIA_Which, MENUSUB, - SYSIA_DrawInfo, dri, - IA_Left, txtlen - TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - - menu_glyph_width[NSA_GLYPH_SUBMENU] - icon_width, + SYSIA_Which, MENUSUB, + SYSIA_DrawInfo, dri, + IA_Left, left_posn, TAG_DONE); } @@ -430,6 +438,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, LABEL_Image, icon, + LABEL_Text, " ", LABEL_Text, gwin->menulab[i], LABEL_DisposeImage, TRUE, LABEL_Image, submenuarrow, |