Commit 2df84a17 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

[399] Menu shortcuts misplaced if the menu has a scroll bar

When a menu is so tall it gains a scroll bar, the shortcuts were incorrectly justified.
Change the MOVE VDU sequence prior to plotting the menu entry so Font Manager justifies the text correctly.

Version 5.55. Tagged as 'Wimp-5_55'
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.54"
Module_Version SETA 554
Module_MajorVersion SETS "5.55"
Module_Version SETA 555
Module_MinorVersion SETS ""
Module_Date SETS "28 May 2016"
Module_ApplicationDate SETS "28-May-16"
Module_Date SETS "16 Sep 2016"
Module_ApplicationDate SETS "16-Sep-16"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.54"
Module_HelpVersion SETS "5.54 (28 May 2016)"
Module_FullVersion SETS "5.55"
Module_HelpVersion SETS "5.55 (16 Sep 2016)"
END
/* (5.54)
/* (5.55)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.54
#define Module_MajorVersion_CMHG 5.55
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 May 2016
#define Module_Date_CMHG 16 Sep 2016
#define Module_MajorVersion "5.54"
#define Module_Version 554
#define Module_MajorVersion "5.55"
#define Module_Version 555
#define Module_MinorVersion ""
#define Module_Date "28 May 2016"
#define Module_Date "16 Sep 2016"
#define Module_ApplicationDate "28-May-16"
#define Module_ApplicationDate "16-Sep-16"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.54"
#define Module_HelpVersion "5.54 (28 May 2016)"
#define Module_LibraryVersionInfo "5:54"
#define Module_FullVersion "5.55"
#define Module_HelpVersion "5.55 (16 Sep 2016)"
#define Module_LibraryVersionInfo "5:55"
......@@ -5741,7 +5741,11 @@ fixupfontstring_end
MOV R0, #4 ;Move to
LDR R1, redrawhandle
BIC R1, R1, #3
LDR R3, [R1, #w_flags]
LDR R1, [R1, #w_x1]
TST R3, #wf_icon5
LDRNE R3, vscroll_width
SUBNE R1, R1, R3 ; menu includes a vertical scroll bar
[ ThreeDPatch
LDRB R14, arrowIconWidth
SUB R1, R1, #16 - 6 ; portion of excess text icon width on right
......
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