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

Fix for menu opening position

Chars took it upon itself to open the font menu at x-102,y+64 rather than x-64,y+0 like the Style Guide says.
Also fixed misreported buffer size to OS_ReadVarVal - moot since the next link uses the $ operator to pick up the string which is limited to 256 anyway.

Version 1.25. Tagged as 'Chars-1_25'
parent b41ce340
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.24"
Module_Version SETA 124
Module_MajorVersion SETS "1.25"
Module_Version SETA 125
Module_MinorVersion SETS ""
Module_Date SETS "29 Jun 2014"
Module_ApplicationDate SETS "29-Jun-14"
Module_Date SETS "27 Jan 2015"
Module_ApplicationDate SETS "27-Jan-15"
Module_ComponentName SETS "Chars"
Module_ComponentPath SETS "castle/RiscOS/Sources/Apps/Chars"
Module_FullVersion SETS "1.24"
Module_HelpVersion SETS "1.24 (29 Jun 2014)"
Module_FullVersion SETS "1.25"
Module_HelpVersion SETS "1.25 (27 Jan 2015)"
END
/* (1.24)
/* (1.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.24
#define Module_MajorVersion_CMHG 1.25
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 29 Jun 2014
#define Module_Date_CMHG 27 Jan 2015
#define Module_MajorVersion "1.24"
#define Module_Version 124
#define Module_MajorVersion "1.25"
#define Module_Version 125
#define Module_MinorVersion ""
#define Module_Date "29 Jun 2014"
#define Module_Date "27 Jan 2015"
#define Module_ApplicationDate "29-Jun-14"
#define Module_ApplicationDate "27-Jan-15"
#define Module_ComponentName "Chars"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Chars"
#define Module_FullVersion "1.24"
#define Module_HelpVersion "1.24 (29 Jun 2014)"
#define Module_LibraryVersionInfo "1:24"
#define Module_FullVersion "1.25"
#define Module_HelpVersion "1.25 (27 Jan 2015)"
#define Module_LibraryVersionInfo "1:25"
......@@ -23,7 +23,7 @@ DIM wid% 1024 : REM added to allow centring of font chars in the grid
: REM if curf% > -1 then each wid%!(4*i%) holds the width in millipoints of character code i.
FOR i% = 0 TO 255: wid%!i% = 0: NEXT i%
PROCms_load("chars:messages")
PROCms_load("Chars:Messages")
LM%=16:RM%=16:BM%=16:TM%=16
MXSP%=24:MYSP%=44
......@@ -201,7 +201,7 @@ REM $menudata% = LEFT$(FNms_1("Menu",""),12)
REM menudata%!(28+12)=sysfont%
REM menudata%!16 = FNmax(menudata%!16,FNmax(LEN$menudata%-3,LEN$sysfont%)*16+12)
REMmenudata%?12=A%
SYS "Wimp_CreateMenu",,menudata%,mousex%-102,mousey%+64
SYS "Wimp_CreateMenu",,menudata%,mousex%-64,mousey%
ENDPROC
DEF FNmax(A%,B%) IF A%>B% THEN =A% ELSE =B%
......@@ -337,7 +337,7 @@ LOCAL i%,l%
LOCAL ERROR
ON ERROR LOCAL q%!12=q%!8:SYS"Wimp_SendMessage",19,q%,q%!4:ENDPROC
i%=q%!20
SYS"XOS_ReadVarVal","Chars$Dir",buffer%,1024,0,3 TO ,,l%
SYS"XOS_ReadVarVal","Chars$Dir",buffer%,&200,0,3 TO ,,l%
buffer%?l%=13
BPUT#i%,"AddTinyDir "+$buffer%
ENDPROC
......
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