lcl: fixed compile

src/lcl/fresnel.lcl.pas

@@ -37,19 +37,21 @@ type
   public
     Engine: TFresnelLCLFontEngine;
     Family: string;
-    Kerning: string;
+    Kerning: TFresnelCSSKerning;
     Size: TFresnelLength;
     Style: string;
     Variant_: string;
     Weight: TFresnelLength;
+    Width: TFresnelLength;
     LCLFont: TFont;
     destructor Destroy; override;
     function GetFamily: string;
-    function GetKerning: string;
+    function GetKerning: TFresnelCSSKerning;
     function GetSize: TFresnelLength;
     function GetStyle: string;
     function GetVariant: string;
     function GetWeight: TFresnelLength;
+    function GetWidth: TFresnelLength;
     function TextSize(const aText: string): TFresnelPoint; virtual;
     function TextSizeMaxWidth(const aText: string; MaxWidth: TFresnelLength
       ): TFresnelPoint; virtual;
@@ -183,11 +185,13 @@ begin
   if Result<>0 then exit;
   Result:=CompareText(Font1.Style,Font2.Style);
   if Result<>0 then exit;
+  Result:=CompareText(Font1.Variant_,Font2.Variant_);
+  if Result<>0 then exit;
   Result:=CompareValue(Font1.Weight,Font2.Weight);
   if Result<>0 then exit;
-  Result:=CompareText(Font1.Variant_,Font2.Variant_);
+  Result:=CompareValue(Font1.Width,Font2.Width);
   if Result<>0 then exit;
-  Result:=CompareText(Font1.Kerning,Font2.Kerning);
+  Result:=CompareValue(ord(Font1.Kerning),ord(Font2.Kerning));
 end;
 
 function CompareFresnelFontDescWithLCLFont(Key, Item: Pointer): integer;
@@ -203,9 +207,11 @@ begin
   if Result<>0 then exit;
   Result:=CompareValue(Desc^.Weight,aFont.Weight);
   if Result<>0 then exit;
+  Result:=CompareValue(Desc^.Width,aFont.Width);
+  if Result<>0 then exit;
   Result:=CompareText(Desc^.Variant_,aFont.Variant_);
   if Result<>0 then exit;
-  Result:=CompareText(Desc^.Kerning,aFont.Kerning);
+  Result:=CompareValue(ord(Desc^.Kerning),ord(aFont.Kerning));
 end;
 
 procedure FresnelRectToRect(const Src: TFresnelRect; out Dest: TRect);
@@ -717,6 +723,7 @@ begin
   aFont.Style:=Desc.Style;
   aFont.Variant_:=Desc.Variant_;
   aFont.Weight:=Desc.Weight;
+  aFont.Width:=Desc.Width;
   FFonts.Add(aFont);
   Result:=aFont;
 end;
@@ -803,7 +810,7 @@ begin
   Result:=Family;
 end;
 
-function TFresnelLCLFont.GetKerning: string;
+function TFresnelLCLFont.GetKerning: TFresnelCSSKerning;
 begin
   Result:=Kerning;
 end;
@@ -828,6 +835,11 @@ begin
   Result:=Weight;
 end;
 
+function TFresnelLCLFont.GetWidth: TFresnelLength;
+begin
+  Result:=Width;
+end;
+
 function TFresnelLCLFont.TextSize(const aText: string): TFresnelPoint;
 var
   p: TPoint;