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

Fix to incorrect tint of back & close icon after changing tool sets

If the last window drawn before dropping to the command line had the input focus then a *TOOLSPRITES command is used the default translation table would be tinted.
On reentering the desktop the back & close icon of the first window draw (= top of stack) would be the wrong colour.

Tagged as Wimp-5_30-pre3.
parent 1f206e86
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
......
......@@ -3,7 +3,7 @@
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
*/
#define Module_MajorVersion_CMHG 5.29
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 May 2013
......
......@@ -836,6 +836,10 @@ cachetoolspriteaddress ; [spritename], [thisCBptr], [lengthflags] as for cachesp
STR R2,spritename
MOV R2,#0
STR R2,lengthflags ; [spritename] is absolute
[ TrueIcon3
STRB R2,tinted_tool ; tinting off, incase the last window drawn was
; tinted before dropping to the CLI for *TOOLSPRITES
]
;
BL freetooltrans ; release tool translation table
BL cachetoolspritedata ; attempt to build a suitable pixtrans table
......@@ -2928,15 +2932,17 @@ Tool_SpriteOp
TEQ R1,#0
BEQ %FT05
Push "R2"
Debug tools,"Need regen",R7
BL restore_tool_list ; ensure tool list valid, get 1st sprite entry
BL recache_tools_trans ; make new tpixtable from 1st sprite entry
Pull "R2"
LDR R7,tool_transtable ; reload new table
Debug tools,"Regen ",R7
MOV R1,#0
STRB R1,tsprite_needsregen
05
LDR R1,tool_area ; R1 is quite often wrong!
BIC R2,R2,#1
BIC R2,R2,#1 ; flag of masked
SWI XOS_SpriteOp
EXITS
......
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