Commit 96a860b5 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Change titlecolour variable to truetitlecolour

The word wide variable actually contains the RGB value, rename this to be distinct from the 4 bit Wimp colour, to make searching easier.
No change to binary, not tagged.
parent 18031756
......@@ -1182,7 +1182,7 @@ trueworkbg # 4 ; work area background colour
truescoutcolour # 4 ; scroll bar outer colour
truescincolour # 4 ; scroll bar inner colour
truetitlebg2 # 4 ; title background colour when highlighted for input focus
titlecolour # 4 ; independent of input focus status
truetitlecolour # 4 ; independent of input focus status
[ TrueSelectionColours
# 4 ; spare word because of selected icon bg
]
......
......@@ -8128,7 +8128,7 @@ no_thin_border
TST R14, #ws_hasfocus
LDREQ R0, truetitlebg
LDRNE R0, truetitlebg2
STR R0, titlecolour ; title backgraound, irrespective of input focus
STR R0, truetitlecolour ; title backgraound, irrespective of input focus
BL window_bg
|
......@@ -8212,7 +8212,7 @@ redrawoutlp_done_tracing
ADDNE R4,R4,R14,LSR #1 ; r4 -> upper table half (=focus icons)
[ TrueIcon3
LDR R14, titlecolour
LDR R14, truetitlecolour
LDR R0, =rgb_lightgrey
TEQ R0, R14
LDREQ R14, truetitlefg
......@@ -8494,7 +8494,7 @@ vscrollfits
novscroll
[ TrueIcon3
LDR R0, titlecolour
LDR R0,truetitlecolour
|
LDRB R0,titlecolour
]
......
......@@ -1611,7 +1611,7 @@ drawicon_system
[ TrueIcon3
LDR LR, truetitlefg ; forcibly reassert title truecolours
STR LR, truefgcolour
LDR LR, titlecolour
LDR LR, truetitlecolour
STR LR, truebgcolour
]
; Pull "LR"
......
......@@ -3181,7 +3181,7 @@ tintfunc Entry "R1-R8"
TEQEQ R2, R3
EXIT NE ; leave colours alone
LDR R4, titlecolour
LDR R4, truetitlecolour
AND R2, R8, R4, LSR #8 ; title background red component
AND R3, R8, R4, LSR #16 ; title background green component
MOV R4, R4, LSR #24 ; title background blue component
......
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