mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 01:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove some workarounds to make image menus conform better on OS4.1u6. They never quite matched normal menus so are going to look odd when we add more images anyway.

Browse Source
This commit is contained in:
Chris Young 2015-06-16 18:44:52 +01:00
parent c4d5393a97
commit d8ce401591
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
amiga/menu.c
View File

@ -788,7 +788,7 @@ static int ami_menu_calc_item_width(struct gui_window_2 *gwin, int j, struct Ras
static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
{ {
int i, j; int i, j;
int txtlen = 0, subtxtlen = 0; int txtlen = 0;
int left_posn; int left_posn;
struct RastPort *rp = &scrn->RastPort; struct RastPort *rp = &scrn->RastPort;
struct DrawInfo *dri = GetScreenDrawInfo(scrn); struct DrawInfo *dri = GetScreenDrawInfo(scrn);
@ -820,7 +820,6 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
using label.image if there's a bitmap associated with the item. */ using label.image if there's a bitmap associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) { if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) {
int icon_width = 0; int icon_width = 0;
Object *blank_space = NULL;
Object *submenuarrow = NULL; Object *submenuarrow = NULL;
Object *icon = BitMapObj, Object *icon = BitMapObj,
BITMAP_Screen, scrn, BITMAP_Screen, scrn,
@ -836,9 +835,7 @@ 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_SUB) { if(gwin->menutype[i] != NM_SUB) {
left_posn = subtxtlen;
} else {
left_posn = txtlen; left_posn = txtlen;
} }
@ -854,32 +851,8 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
SYSIA_DrawInfo, dri, SYSIA_DrawInfo, dri,
IA_Left, left_posn, IA_Left, left_posn,
TAG_DONE); TAG_DONE);
j = i + 1;
subtxtlen = 0;
do {
if(gwin->menulab[j] != NM_BARLABEL) {
if(gwin->menutype[j] == NM_SUB) {
int item_size = ami_menu_calc_item_width(gwin, j, rp);
if(item_size > subtxtlen) {
subtxtlen = item_size;
}
}
}
j++;
} while((gwin->menutype[j] == NM_SUB));
} }
/**TODO: Checkmark/MX images and keyboard shortcuts
*/
if(gwin->menutype[i] == NM_SUB) {
blank_space = NewObject(NULL, "fillrectclass",
IA_Height, 0,
IA_Width, left_posn + icon_width,
TAG_DONE);
}
gwin->menuobj[i] = LabelObj, gwin->menuobj[i] = LabelObj,
LABEL_MenuMode, TRUE, LABEL_MenuMode, TRUE,
LABEL_DrawInfo, dri, LABEL_DrawInfo, dri,
@ -888,8 +861,6 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
LABEL_Text, " ", LABEL_Text, " ",
LABEL_Text, gwin->menulab[i], LABEL_Text, gwin->menulab[i],
LABEL_DisposeImage, TRUE, LABEL_DisposeImage, TRUE,
LABEL_Image, blank_space,
LABEL_DisposeImage, TRUE,
LABEL_Image, submenuarrow, LABEL_Image, submenuarrow,
LabelEnd; LabelEnd;