Commit 218ea625 authored by Neil Turton's avatar Neil Turton
Browse files

NCOS 1.06 Imported from Zip drive

......@@ -90,10 +90,27 @@ extern _kernel_oserror *menu_update_size(MenuInternal *menu_int) {
if (entry->icon_flags & wimp_ICONFLAGS_TEXT) {
width = (entry->icon_data.indirect_text.buff_len+1)<<4;
} else {
/* IDJ: 22-May-95: bug-fix AQU-01264: look in user sprite area if
one is defined first, then in wimp sprite area as a
fall-back.
*/
e = NULL;
if (entry->icon_data.indirect_sprite.sprite_area != (void *)1 /* user area */)
{
regs.r[0] = os_SpriteOp_ReadInfo + 256;
regs.r[1] = (int) entry->icon_data.indirect_sprite.sprite_area;
regs.r[2] = (int) entry->icon_data.indirect_sprite.sprite.name;
e = _kernel_swi (OS_SpriteOp, &regs, &regs);
}
if (e != NULL || entry->icon_data.indirect_sprite.sprite_area == (void *)1 /* WIMP area */)
{
regs.r[0] = os_SpriteOp_ReadInfo;
regs.r[2] = (int) entry->icon_data.indirect_sprite.sprite.name;
if ((e = _kernel_swi (Wimp_SpriteOp, &regs, &regs)) != NULL) {
if ((e = _kernel_swi (Wimp_SpriteOp, &regs, &regs)) != NULL)
return e;
}
width = regs.r[3];
......
......@@ -229,6 +229,7 @@ _kernel_oserror *create_menu_aux (MenuTemplate *menu_temp, ObjectID object_id, T
}
if (num_entries>0) {
if (menu->hdr.title.indirect_text.buffer) /* SJM: 14/06/96: Only set indirect bit if there is a title */
wimp_menu_entry(menu,0)->flags |= wimp_MENUFLAGS_TITLE_INDIRECT;
wimp_menu_entry(menu,num_entries-1)->flags |= wimp_MENUFLAGS_LAST_ITEM;
}
......
......@@ -22,7 +22,8 @@
; PRODUCT RELEASE
; 06-Feb-95: IDJ: version 0.22
; fixes AQU-01203 (menu_set_entry_text bug) for Black ROM
;
; 14-Jun-96: SJM: version 0.25
; fixes no title width problem
initialisation-code: Menu_init
......@@ -33,7 +34,7 @@ service-call-handler: Menu_services 0x44ec1, 0x44ec2, 0x44ec3
title-string: Menu
help-string: Menu 0.23
help-string: Menu 0.25
command-keyword-table: Menu_commands
Menu_Memory()
......
......@@ -22,6 +22,8 @@
; PRODUCT RELEASE
; 06-Feb-95: IDJ: version 0.22
; fixes AQU-01203 (menu_set_entry_text bug) for Black ROM
; 14-Jun-96: SJM: version 0.25
; fixes no title width problem
;
......@@ -33,7 +35,7 @@ service-call-handler: Menu_services 0x44ec1, 0x44ec2, 0x44ec3
title-string: Menu
help-string: Menu 0.23
help-string: Menu 0.25
swi-chunk-base-number: 0x828c0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment