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

Fix for background colour too light on non-bordered icons

Wimp04.s:
 Line 991, a register fumble meant the special case check (when the icon background colour equals the window work area colour) always failed so the icon background was lightened.
 Removed unnecessary ADR.
Wimp10.s:
 Function getborder() made more readable by use of symbols instead of magic numbers
Fixes ticket #395 reported by Paul Reuvers.

Version 5.45. Tagged as 'Wimp-5_45'
parent 2487da00
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.44"
Module_Version SETA 544
Module_MajorVersion SETS "5.45"
Module_Version SETA 545
Module_MinorVersion SETS ""
Module_Date SETS "18 Aug 2014"
Module_ApplicationDate SETS "18-Aug-14"
Module_Date SETS "05 Sep 2014"
Module_ApplicationDate SETS "05-Sep-14"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.44"
Module_HelpVersion SETS "5.44 (18 Aug 2014)"
Module_FullVersion SETS "5.45"
Module_HelpVersion SETS "5.45 (05 Sep 2014)"
END
/* (5.44)
/* (5.45)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.44
#define Module_MajorVersion_CMHG 5.45
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Aug 2014
#define Module_Date_CMHG 05 Sep 2014
#define Module_MajorVersion "5.44"
#define Module_Version 544
#define Module_MajorVersion "5.45"
#define Module_Version 545
#define Module_MinorVersion ""
#define Module_Date "18 Aug 2014"
#define Module_Date "05 Sep 2014"
#define Module_ApplicationDate "18-Aug-14"
#define Module_ApplicationDate "05-Sep-14"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.44"
#define Module_HelpVersion "5.44 (18 Aug 2014)"
#define Module_LibraryVersionInfo "5:44"
#define Module_FullVersion "5.45"
#define Module_HelpVersion "5.45 (05 Sep 2014)"
#define Module_LibraryVersionInfo "5:45"
......@@ -309,7 +309,6 @@ setwindowcolours ROUT
; Exit: various ptrs and flags set up
; task swap can occur without userblk being set up !!!
;
ASSERT border_normal =0
; do main processing of flags + icon information
......@@ -326,6 +325,7 @@ int_seticonptrs ROUT
;
MOV R14,#0
STR R14,validationstring
ASSERT border_normal =0
STR R14,border_type
MOV R14,#1
......@@ -930,8 +930,7 @@ mungetruecolours ROUT
; further bodge: if the faded icon fg matches the unfaded icon bg AND the window bg, reinstate the unfaded icon fg
; this fixes the questionable way CC fade their gadgets
LDR R14, [R0]
ADR R2, truebgcolour
LDR R2, [R2]
LDR R2, truebgcolour
TEQ R14, R2
Pull "R2"
TEQEQ R14, R2
......@@ -986,7 +985,7 @@ fadetruecolour ROUT
MOV R4, R0
LDR R0, [R4]
TEQ R14, R2
TEQ R0, R2
Pull "R0, R4, PC", EQ ; leave icon background alone if it matches the work area background
BL bgr0_to_y
......
......@@ -34,7 +34,7 @@ getborder EntryS "R2,R4-R5"
Debug bo,"getborder: icon flags, vstring, caller ",R1,R3,R14
MOV R4,#border_normal
MOV R5,#3 ; default values
MOV R5,#sc_midlightgrey ; default values
TST R1,#if_text
TSTNE R1,#if_indirected
......@@ -52,25 +52,23 @@ getborder EntryS "R2,R4-R5"
;
LDRB R14,[R3],#1 ; and then the next character
TEQ R14,#","
BLEQ getnumber ; if its a comma, ie. following number get the highligt colour
BLEQ getnumber ; if its a comma, ie. following number get the highlight colour
MOVEQ R5,R0
10
[ slabinout
CMP R4,#1
CMP R4,#border_slabout
BNE %FT11
TST R1,#if_sprite
BEQ %FT11
LDR R4,two_sprite_save
; EOR R4,R4,R1 ; have flags been muddled with?
TST R4,#is_inverted
MOVNE R4,#2
MOVEQ R4,#1
MOVNE R4,#border_slabin
MOVEQ R4,#border_slabout
]
11
[ true
CMP R4, #border_max ; trap undefined cases immediately
MOVHS R4, #0
]
MOVHS R4, #border_normal
STR R4,border_type
STR R5,border_highlight ; setup the border + its highlight colour
......
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