Commit 72ca8dd8 authored by Ben Avison's avatar Ben Avison
Browse files

Rendering problems with Lazarus title bars and error box buttons fixed.

  Title bars: one of the Ursula redraw optimisations was that if the title
  bar sprites had no mask, then the title bar is no longer filled in before the
  sprites are plotted. Lazarus' toolsprites were falling foul of this, because
  the title bar top and bottom sprites (tbarmidt/tbarmidb) had a lesser height
  than the end sprites (tbarlcap/tbarrcap). Because pre-Ursula Wimps filled
  in the title bar regardless, this may not have shown up in the past. The Wimp
  now has an additional check: if there is a gap between the title bar sprites,
  then it always fills in the title bar background before plotting the sprites.

  Error box buttons: the "illuminated" side of the 3D plinths have always been
  white, so they were getting lost against the white Lazarus UI background.
  Used Ursula Wimp icon colour validation string extension to colour the
  borders a uniform grey.

  Tested on a desktop machine, soft-loading the Lazarus Wimp resources.
  Fixes faults 1115 and 1121.

Version 4.35. Tagged as 'Wimp-4_35'
parent 098e719a
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "4.34"
Module_Version SETA 434
Module_MajorVersion SETS "4.35"
Module_Version SETA 435
Module_MinorVersion SETS ""
Module_Date SETS "09 Nov 1999"
Module_FullVersion SETS "4.34"
Module_Date SETS "22 Nov 1999"
Module_FullVersion SETS "4.35"
/* (4.34)
/* (4.35)
* This file is automatically maintained by srccommit, do not edit manually.
#define Module_MajorVersion_CMHG 4.34
#define Module_MajorVersion_CMHG 4.35
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 09 Nov 1999
#define Module_Date_CMHG 22 Nov 1999
#define Module_MajorVersion "4.34"
#define Module_Version 434
#define Module_MajorVersion "4.35"
#define Module_Version 435
#define Module_MinorVersion ""
#define Module_Date "09 Nov 1999"
#define Module_Date "22 Nov 1999"
#define Module_FullVersion "4.34"
#define Module_FullVersion "4.35"
......@@ -1897,9 +1897,25 @@ dofunkytitlebar Entry "R0-R11"
Push "R1" ; push the flags for use later on
[ TrueIcon3
[ true
Push "R0"
LDR R0, title_topheight
LDR R14, title_bottomheight
ADD R0, R0, R14
ADD R0, R0, #4 ; compensate for the fact that both topheight and bottomheight have been reduced by
; one sprite pixel (not even one screen pixel) - difficult to do properly at this stage
LDR R14, title_height
CMP R0, R14 ; if there's a gap between tbatmidt and tbarmidb, we always need to fill in the background
TEQGE R0, R0 ; if they overlapped, treat them as though they fitted perfectly, and check for mask
Pull "R0"
LDREQ R14, tool_list
LDREQ R14, [R14, #tool_tbarmidt]
TSTEQ R14, #1 ; is title bar solid?
LDR R14, tool_list
LDR R14, [R14, #tool_tbarmidt]
TST R14, #1 ; is title bar solid?
BICNE R1,R1,#if_sprite:OR:if_text
BLNE drawicon_system ; get the background / border plotted for the icon
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