Commit 17cc19c4 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix for menu opening position

Switcher took it upon itself to open its menus at x-width/2,y-12 rather than x-64,y+0 like the Style Guide says.

Version 1.44. Tagged as 'Switcher-1_44'
parent dbf8b9c4
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.43"
Module_Version SETA 143
Module_MajorVersion SETS "1.44"
Module_Version SETA 144
Module_MinorVersion SETS ""
Module_Date SETS "21 Dec 2014"
Module_ApplicationDate SETS "21-Dec-14"
Module_Date SETS "27 Jan 2015"
Module_ApplicationDate SETS "27-Jan-15"
Module_ComponentName SETS "Switcher"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Switcher"
Module_FullVersion SETS "1.43"
Module_HelpVersion SETS "1.43 (21 Dec 2014)"
Module_FullVersion SETS "1.44"
Module_HelpVersion SETS "1.44 (27 Jan 2015)"
END
/* (1.43)
/* (1.44)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.43
#define Module_MajorVersion_CMHG 1.44
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Dec 2014
#define Module_Date_CMHG 27 Jan 2015
#define Module_MajorVersion "1.43"
#define Module_Version 143
#define Module_MajorVersion "1.44"
#define Module_Version 144
#define Module_MinorVersion ""
#define Module_Date "21 Dec 2014"
#define Module_Date "27 Jan 2015"
#define Module_ApplicationDate "21-Dec-14"
#define Module_ApplicationDate "27-Jan-15"
#define Module_ComponentName "Switcher"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Switcher"
#define Module_FullVersion "1.43"
#define Module_HelpVersion "1.43 (21 Dec 2014)"
#define Module_LibraryVersionInfo "1:43"
#define Module_FullVersion "1.44"
#define Module_HelpVersion "1.44 (27 Jan 2015)"
#define Module_LibraryVersionInfo "1:44"
......@@ -5602,12 +5602,10 @@ notinfobox
STR userblk,menu_userblk ; for help stuff
LDR R2,[R1] ; mouse x
MOV R3,#96 + 4*44 - 12
MOV R3,#96 + 4*44
ADRL R1,m_iconbarmenu
STR R1,menuhandle
LDR R14,[R1,#16] ; get menu width
SUB R2,R2,R14,ASR #1 ; ensure mouse ptr is in middle
ADD R3,R3,#12
SUB R2,R2,#64 ; Style Guide magic offset
SWI XWimp_CreateMenu
Pull "PC",VS
......@@ -5703,9 +5701,7 @@ gomenu
LDMIA R1,{R2,R3} ; mouse x,y (may be faked)
ADRL R1,m_taskdisplaymenu
STR R1,menuhandle
LDR R14,[R1,#16] ; get menu width
SUB R2,R2,R14,ASR #1 ; ensure mouse ptr is in middle
ADD R3,R3,#12
SUB R2,R2,#64 ; Style Guide magic offset
SWIVC XWimp_CreateMenu ; bugfix
Pull "PC",VS
......
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