Commit ffe19f69 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix for weird text in floppy format menu

The menu icon block for the various native format floppy discs was writing the length and validation string pointers the wrong way round. By chance, there's now a vaguely valid validation string character at the address of the length of the "ADFS 1600K (F+)" entry, which made is into a string of 'o's for some reason.
Also, corrected the width calculation for half a system font character at either end - not that relevant as the Wimp's calculated it for years.
Tested briefly in an IOMD ROM, menu looks right.

Version 1.08. Tagged as 'ADFSFiler-1_08'
parent df9d848b
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.07"
Module_Version SETA 107
Module_MajorVersion SETS "1.08"
Module_Version SETA 108
Module_MinorVersion SETS ""
Module_Date SETS "25 Aug 2013"
Module_ApplicationDate SETS "25-Aug-13"
Module_Date SETS "20 Feb 2015"
Module_ApplicationDate SETS "20-Feb-15"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "1.07"
Module_HelpVersion SETS "1.07 (25 Aug 2013)"
Module_FullVersion SETS "1.08"
Module_HelpVersion SETS "1.08 (20 Feb 2015)"
END
/* (1.07)
/* (1.08)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.07
#define Module_MajorVersion_CMHG 1.08
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Aug 2013
#define Module_Date_CMHG 20 Feb 2015
#define Module_MajorVersion "1.07"
#define Module_Version 107
#define Module_MajorVersion "1.08"
#define Module_Version 108
#define Module_MinorVersion ""
#define Module_Date "25 Aug 2013"
#define Module_Date "20 Feb 2015"
#define Module_ApplicationDate "25-Aug-13"
#define Module_ApplicationDate "20-Feb-15"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "1.07"
#define Module_HelpVersion "1.07 (25 Aug 2013)"
#define Module_LibraryVersionInfo "1:7"
#define Module_FullVersion "1.08"
#define Module_HelpVersion "1.08 (20 Feb 2015)"
#define Module_LibraryVersionInfo "1:8"
......@@ -4081,11 +4081,13 @@ BuildFormatMenu ROUT
CMP R14,#32
BGE %BT02
SUB R1,R9,R1
MOV R14,#0
STR R14,[R2],#4 ; No validation string.
STR R1,[R2],#4 ; Length of string
; If longer than longest so far, update menu header
MOV R14,R1,ASL #4 ; *16
ADD R14,R14,#12 ; +12 = Length in OS Units
ADD R14,R14,#16 ; +16 = Half a char at each end in OS Units
CMP r5,#0
BEQ %FT80
LDR R9,[r0,#EnumFormats_Flags]
......@@ -4100,8 +4102,6 @@ BuildFormatMenu ROUT
MOVGT R6,R14
82
MOV R1,#0
STR R1,[R2],#4 ; No validation string.
NextItem
CMP r0,#0
......
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