Browse Source

skia gtk3: fixed compile

mattias 1 năm trước cách đây
mục cha
commit
1e467fc0eb

+ 0 - 5
demo/Button/ButtonSkia.lpi

@@ -55,11 +55,6 @@
         <DebugInfoType Value="dsDwarf2"/>
       </Debugging>
     </Linking>
-    <Other>
-      <ConfigFile>
-        <WriteConfigFilePath Value=""/>
-      </ConfigFile>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions>

+ 1 - 0
demo/Button/ButtonSkia.lpr

@@ -1,6 +1,7 @@
 program ButtonSkia;
 
 uses
+  dl,
   Fresnel, // initializes the widgetset
   Fresnel.App, MainUnit;
 

+ 7 - 7
demo/Button/MainUnit.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Fresnel.Forms, Fresnel.Controls, Fresnel.Events,
-  FCL.Events, LazLoggerBase;
+  FCL.Events;
 
 type
 
@@ -37,32 +37,32 @@ implementation
 
 procedure TMainForm.Label1Click(Event: TAbstractEvent);
 begin
-  DebugLn(['TMainForm.Label1Click ',Event.EventID]);
+  writeln('TMainForm.Label1Click ',Event.EventID);
 end;
 
 procedure TMainForm.Div1MouseDown(Event: TFresnelMouseEvent);
 begin
-  debugln(['TMainForm.Div1MouseDown ',Event.ControlX,',',Event.ControlY]);
+  writeln('TMainForm.Div1MouseDown ',Event.ControlX,',',Event.ControlY);
 end;
 
 procedure TMainForm.Div1MouseMove(Event: TFresnelMouseEvent);
 begin
-  debugln(['TMainForm.Div1MouseMove ',Event.ControlX,',',Event.ControlY]);
+  writeln('TMainForm.Div1MouseMove ',Event.ControlX,',',Event.ControlY);
 end;
 
 procedure TMainForm.Label1MouseDown(Event: TFresnelMouseEvent);
 begin
-  debugln(['TMainForm.Label1MouseDown ',Event.ControlX,',',Event.ControlY]);
+  writeln('TMainForm.Label1MouseDown ',Event.ControlX,',',Event.ControlY);
 end;
 
 procedure TMainForm.Label1MouseMove(Event: TFresnelMouseEvent);
 begin
-  debugln(['TMainForm.Label1MouseMove ',Event.ControlX,',',Event.ControlY]);
+  writeln('TMainForm.Label1MouseMove ',Event.ControlX,',',Event.ControlY);
 end;
 
 procedure TMainForm.Label1MouseUp(Event: TFresnelMouseEvent);
 begin
-  debugln(['TMainForm.Label1MouseUp ',Event.ControlX,',',Event.ControlY]);
+  writeln('TMainForm.Label1MouseUp ',Event.ControlX,',',Event.ControlY);
 end;
 
 end.

+ 3 - 0
src/gtk3/fresnel.gtk3.pas

@@ -10,6 +10,9 @@ uses
   LazGtk3, LazGObject2, LazGLib2, LazGio2, Lazcairo1, LazGdk3,
   {$IFDEF FresnelSkia}
   // skia
+  {$IFDEF Linux}
+  dynlibs,
+  {$ENDIF}
   System.Skia, Fresnel.SkiaRenderer,
   {$ENDIF}
   // fresnel

+ 13 - 9
src/skia/fresnel.skiarenderer.pas

@@ -5,8 +5,12 @@ unit Fresnel.SkiaRenderer;
 interface
 
 uses
-  Classes, SysUtils, Types, AVL_Tree, FpImage, System.UITypes, AvgLvlTree,
-  LazLoggerBase, System.Skia, Fresnel.Classes, Fresnel.DOM, Fresnel.Renderer;
+  Classes, SysUtils, Types,
+  {$IFDEF Linux}
+  dynlibs,
+  {$ENDIF}
+  AVL_Tree, FpImage, System.UITypes,
+  System.Skia, Fresnel.Classes, Fresnel.DOM, Fresnel.Renderer;
 
 type
   TFresnelSkiaFontEngine = class;
@@ -58,8 +62,8 @@ type
 
   TFresnelSkiaFontEngine = class(TFresnelFontEngine)
   private
-    FTypeFaces: TAvgLvlTree; // tree of TFresnelSkiaTypeFace sorted with CompareFresnelSkiaTypeFace
-    FFonts: TAvgLvlTree; // tree of TFresnelSkiaFont sorted with CompareFresnelSkiaFont
+    FTypeFaces: TAVLTree; // tree of TFresnelSkiaTypeFace sorted with CompareFresnelSkiaTypeFace
+    FFonts: TAVLTree; // tree of TFresnelSkiaFont sorted with CompareFresnelSkiaFont
   protected
     procedure TypeFaceRefCount0(aTypeFace: TFresnelSkiaTypeFace);
   public
@@ -258,13 +262,13 @@ end;
 constructor TFresnelSkiaFontEngine.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
-  FFonts:=TAvgLvlTree.Create(@CompareFresnelSkiaFont);
-  FTypeFaces:=TAvgLvlTree.Create(@CompareFresnelSkiaTypeFace);
+  FFonts:=TAVLTree.Create(@CompareFresnelSkiaFont);
+  FTypeFaces:=TAVLTree.Create(@CompareFresnelSkiaTypeFace);
 end;
 
 destructor TFresnelSkiaFontEngine.Destroy;
 var
-  Node: TAvgLvlTreeNode;
+  Node: TAVLTreeNode;
   aFont: TFresnelSkiaFont;
 begin
   Node:=FFonts.Root;
@@ -286,7 +290,7 @@ end;
 function TFresnelSkiaFontEngine.FindFont(const Desc: TFresnelFontDesc
   ): TFresnelSkiaFont;
 var
-  Node: TAvgLvlTreeNode;
+  Node: TAVLTreeNode;
 begin
   Node:=FFonts.FindKey(@Desc,@CompareFresnelFontDescWithSkiaFont);
   if Node=nil then
@@ -298,7 +302,7 @@ end;
 function TFresnelSkiaFontEngine.FindTypeFace(const Desc: TFresnelFontDesc
   ): TFresnelSkiaTypeFace;
 var
-  Node: TAvgLvlTreeNode;
+  Node: TAVLTreeNode;
 begin
   Node:=FFonts.FindKey(@Desc,@CompareFresnelFontDescWithSkiaTypeFace);
   if Node=nil then