diff --git a/Resources/UK/Lazarus/Templates,fec b/Resources/UK/Lazarus/Templates,fec index 4b52b0262c997363a141f45083dde06375ed2bb2..fa317cef5a6c8eba5b8facaa31581e1b64ff9a20 100644 Binary files a/Resources/UK/Lazarus/Templates,fec and b/Resources/UK/Lazarus/Templates,fec differ diff --git a/VersionASM b/VersionASM index 6b2c9cd3c8a46e5e6ff21b1c7e4aec9c4a6f96d4..9d1c26e7ee3d6f7aacdfd3c41659ad4f287df839 100644 --- a/VersionASM +++ b/VersionASM @@ -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" END diff --git a/VersionNum b/VersionNum index f48e623a9d0eb4269c822345831689b9aa3b5852..2deca495946c7f20ec808691346128946ab66e69 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (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" diff --git a/s/Wimp10 b/s/Wimp10 index 343ff02297e26298c0b9cb0f03814d47a5bfe29d..89f94734ebd095afa4f9f2f6d43c4c8dbc4af0ee 100644 --- a/s/Wimp10 +++ b/s/Wimp10 @@ -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 |