Skip to content

Commit 8f75e68

Browse files
committed
version 6.4 - old delphis packages attribute
1 parent 9231a0f commit 8f75e68

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

CompInstall.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ IniVersion=2
33

44
[General]
55
Name=Digao Dalpiaz - DzHTMLText component
6-
Version=6.3
6+
Version=6.4
77
DelphiVersions=XE3;XE4;XE5;XE6;XE7;XE8;10;10.1;10.2;10.3;10.4;11;12
88
Packages=DzHTMLText_VCL;DzHTMLText_FMX;DzHTMLTextDesign_VCL;DzHTMLTextDesign_FMX
99
AddLibrary=1

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,17 @@
3636

3737
## What's New
3838

39-
- 03/25/2024 (Version 6.3)
39+
- 03/26/2024 (Version 6.4)
4040

41-
- VCL font scaling review (Height is calculated by default screen PPI)
41+
- Fix Delphi XE3 compiling (Design packages and FMX FillRect)
4242

4343
<details>
4444
<summary>Click here to view the entire changelog</summary>
4545

46+
- 03/25/2024 (Version 6.3)
47+
48+
- VCL font scaling review (Height is calculated by default screen PPI)
49+
4650
- 03/24/2024 (Version 6.2)
4751

4852
- Better FMX design-time border (using the Delphi pattern).
@@ -783,8 +787,8 @@ When you type Chinese, Japanese or Korean characters, this behavior is quite dif
783787
All measurements will be calculated based on the Design DPI (always 96 pixels per inch), and applied to the current Monitor DPI. Example: if you specified a tab width as 60 pixels, at 96 DPI, when displaying the text on a 120 DPI monitor, the tab width will be larger (75 pixels).
784788

785789
For automatic scaling by DPI to work correctly, it is necessary to use Windows 8.1 or higher, and Delphi 10 or higher, or Lazarus.
786-
If using Delphi previous version, the scaling will be based on default DPI (96).
787-
If using Windows previous version, the scaling will be based on the default monitor DPI.
790+
If using Delphi previous version, the scaling will be disabled.
791+
If using Windows previous version, the scaling will be based on the default monitor DPI, and not on application current monitor.
788792

789793
### FMX
790794

Source/Design/DzHTMLTextDesign_FMX.dproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
9797
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
9898
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
99-
<DCC_DebugInformation>0</DCC_DebugInformation>
10099
</PropertyGroup>
101100
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
102101
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>

Source/Design/DzHTMLTextDesign_VCL.dproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
9797
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
9898
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
99-
<DCC_DebugInformation>0</DCC_DebugInformation>
10099
</PropertyGroup>
101100
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
102101
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>

Source/Vcl.DHCommon.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ procedure GenericFillRect(Lb: TDzHTMLText; C: TCanvas; R: TAnyRect; FixPrecision
307307

308308
C.FillRect(
309309
{$IFDEF FMX}
310-
R, Lb.Opacity
310+
R, 0, 0, [], Lb.Opacity
311311
{$ELSE}
312312
R
313313
{$ENDIF});

Source/Vcl.DzHTMLText.pas

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface
2929
{$ENDIF}
3030
{$ENDIF};
3131

32-
const DZHTMLTEXT_INTERNAL_VERSION = 713; //Synchronizes TDam component
32+
const DZHTMLTEXT_INTERNAL_VERSION = 714; //Synchronizes TDam component
3333

3434
const _DEF_LISTLEVELPADDING = 20;
3535

@@ -679,7 +679,7 @@ implementation
679679
{$ENDIF}
680680
{$ENDIF};
681681

682-
const STR_VERSION = '6.3';
682+
const STR_VERSION = '6.4';
683683

684684
const DEFAULT_PPI = 96;
685685

@@ -1282,7 +1282,7 @@ procedure TDzHTMLText.CanvasProcess(C: TCanvas);
12821282
if Color<>clNone then
12831283
begin
12841284
C.Fill.Color := FColor;
1285-
C.FillRect(LocalRect, Opacity);
1285+
C.FillRect(LocalRect, 0, 0, [], Opacity);
12861286
end;
12871287
{$ELSE}
12881288
if not FTransparent then
@@ -1650,12 +1650,17 @@ procedure TDzHTMLText.CMMouseleave(var Message: TMessage);
16501650
end;
16511651

16521652
{$IFDEF VCL}
1653-
type THackForm = class(TCustomForm); //older Delphi version - Scaled is a protected property
1653+
{$IF (Defined(DCC) and (CompilerVersion >= 30)) or Defined(FPC)} //D10 Seattle or Lazarus
1654+
{$DEFINE PPI_SCALING}
1655+
{$ENDIF}
1656+
type THackForm = class(TCustomForm); //only in Delphi 11 the property "Scaled" is public (before is protected)
16541657
function TDzHTMLText.CalcMulDiv(Size: Integer): Integer;
1658+
{$IFDEF PPI_SCALING}
16551659
var
16561660
MonitorPPI, DesignPPI: Integer;
1661+
{$ENDIF}
16571662
begin
1658-
{$IF (Defined(DCC) and (CompilerVersion >= 30)) or Defined(FPC)} //D10 Seattle or Lazarus
1663+
{$IFDEF PPI_SCALING}
16591664
if (ParentForm<>nil) and THackForm(ParentForm).Scaled
16601665
{$IFDEF DCC}and not (csDesigning in ComponentState){$ENDIF} //design always based on Default PPI in Delphi
16611666
then

0 commit comments

Comments
 (0)