mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-07 11:32:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add some space between icon and text in the menu

Browse Source
This commit is contained in:
Chris Young 2014-07-01 18:29:10 +01:00
parent 06eb81235d
commit 291f1094eb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
amiga/menu.c
View File

@ -362,8 +362,10 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
{ {
int i, j; int i, j;
int txtlen = 0; int txtlen = 0;
int left_posn;
struct RastPort *rp = &scrn->RastPort; struct RastPort *rp = &scrn->RastPort;
struct DrawInfo *dri = GetScreenDrawInfo(scrn); struct DrawInfo *dri = GetScreenDrawInfo(scrn);
int space_width = TextLength(rp, " ", 1);
if(menu_glyphs_loaded == false) if(menu_glyphs_loaded == false)
ami_menu_load_glyphs(dri); 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->menulab[j] != NM_BARLABEL) {
if(gwin->menutype[j] == NM_ITEM) { if(gwin->menutype[j] == NM_ITEM) {
item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j])); item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j]));
item_size += space_width;
if(gwin->menukey[j]) { if(gwin->menukey[j]) {
item_size += TextLength(rp, &gwin->menukey[j], 1); item_size += TextLength(rp, &gwin->menukey[j], 1);
item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY];
@ -415,11 +419,15 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
GetAttr(IA_Width, icon, (ULONG *)&icon_width); GetAttr(IA_Width, icon, (ULONG *)&icon_width);
if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { 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", submenuarrow = NewObject(NULL, "sysiclass",
SYSIA_Which, MENUSUB, SYSIA_Which, MENUSUB,
SYSIA_DrawInfo, dri, SYSIA_DrawInfo, dri,
IA_Left, txtlen - TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - IA_Left, left_posn,
menu_glyph_width[NSA_GLYPH_SUBMENU] - icon_width,
TAG_DONE); TAG_DONE);
} }
@ -430,6 +438,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
LABEL_DrawInfo, dri, LABEL_DrawInfo, dri,
LABEL_DisposeImage, TRUE, LABEL_DisposeImage, TRUE,
LABEL_Image, icon, LABEL_Image, icon,
LABEL_Text, " ",
LABEL_Text, gwin->menulab[i], LABEL_Text, gwin->menulab[i],
LABEL_DisposeImage, TRUE, LABEL_DisposeImage, TRUE,
LABEL_Image, submenuarrow, LABEL_Image, submenuarrow,