Commit 6934bac6 authored by Ben Avison's avatar Ben Avison
Browse files

Merged in changes from Castle

Detail:
  Fixed 'Resonution' menu title error
  'Resolution' was being corrupted to 'Resonution' if first entry qualified
  for a dotted line above.. the flag set location was the 'l' of the title
Admin:
  Not tested

Version 0.39. Tagged as 'Display-0_39'
parent 3c17f6fb
; ;
; This file is automatically maintained by srccommit, do not edit manually. ; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68. ; Last processed by srccommit version: 1.1.
; ;
GBLS Module_MajorVersion GBLS Module_MajorVersion
GBLA Module_Version GBLA Module_Version
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "0.38" Module_MajorVersion SETS "0.39"
Module_Version SETA 38 Module_Version SETA 39
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "03 Feb 2003" Module_Date SETS "12 Oct 2008"
Module_ApplicationDate SETS "03-Feb-03" Module_ApplicationDate SETS "12-Oct-08"
Module_ComponentName SETS "Display" Module_ComponentName SETS "Display"
Module_ComponentPath SETS "RiscOS/Sources/Video/UserI/Display" Module_ComponentPath SETS "RiscOS/Sources/Video/UserI/Display"
Module_FullVersion SETS "0.38" Module_FullVersion SETS "0.39"
Module_HelpVersion SETS "0.38 (03 Feb 2003)" Module_HelpVersion SETS "0.39 (12 Oct 2008)"
END END
/* (0.38) /* (0.39)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.38 #define Module_MajorVersion_CMHG 0.39
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Feb 2003 #define Module_Date_CMHG 12 Oct 2008
#define Module_MajorVersion "0.38" #define Module_MajorVersion "0.39"
#define Module_Version 38 #define Module_Version 39
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "03 Feb 2003" #define Module_Date "12 Oct 2008"
#define Module_ApplicationDate "03-Feb-03" #define Module_ApplicationDate "12-Oct-08"
#define Module_ComponentName "Display" #define Module_ComponentName "Display"
#define Module_ComponentPath "RiscOS/Sources/Video/UserI/Display" #define Module_ComponentPath "RiscOS/Sources/Video/UserI/Display"
#define Module_FullVersion "0.38" #define Module_FullVersion "0.39"
#define Module_HelpVersion "0.38 (03 Feb 2003)" #define Module_HelpVersion "0.39 (12 Oct 2008)"
#define Module_LibraryVersionInfo "0:38" #define Module_LibraryVersionInfo "0:39"
...@@ -247,7 +247,8 @@ Menu_Resolution ...@@ -247,7 +247,8 @@ Menu_Resolution
[ SortOnPixelShape [ SortOnPixelShape
LDR r2, [r5, #mode_desc_flags-mode_desc_name] LDR r2, [r5, #mode_desc_flags-mode_desc_name]
AND r2, r2, #flags_squarepixel AND r2, r2, #flags_squarepixel
TEQ r2, r10 ; If different pixel shape then TEQ r8, #0 ; don't do dotted above first entry
TEQNE r2, r10 ; If different pixel shape then
MOVNE r10, r2 ; put in a separator after last item. MOVNE r10, r2 ; put in a separator after last item.
LDRNE r2, [r1, #mi_itemflags-mi_size] LDRNE r2, [r1, #mi_itemflags-mi_size]
ORRNE r2, r2, #mi_it_dotted ORRNE r2, r2, #mi_it_dotted
......
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