Bläddra i källkod

design: change parent

mattias 2 år sedan
förälder
incheckning
1dd330205e

+ 10 - 5
demo/LazDesignerForm/FloatLayoutUnit1.lfm

@@ -1,6 +1,11 @@
-object FresnelForm1: TFresnelForm1
-  FormLeft = 387
-  FormHeight = 240
-  FormTop = 456
-  FormWidth = 320
+object FresnelForm2: TFresnelForm2
+  Caption = 'FresnelForm2'
+  FormHeight = 250
+  FormLeft = 450
+  FormTop = 300
+  FormWidth = 350
+  object FresnelBody1: TFresnelBody
+    object FresnelDiv1: TFresnelDiv
+    end
+  end
 end

+ 6 - 4
demo/LazDesignerForm/FloatLayoutUnit1.pas

@@ -5,13 +5,15 @@ unit FloatLayoutUnit1;
 interface
 
 uses
-  Classes, SysUtils, FresnelLCLControls, FresnelDOM, FresnelControls, StdCtrls;
+  Classes, SysUtils, FresnelLCLControls, FresnelDOM, FresnelControls;
 
 type
 
-  { TFresnelForm1 }
+  { TFresnelForm2 }
 
-  TFresnelForm1 = class(TFresnelForm)
+  TFresnelForm2 = class(TFresnelForm)
+    FresnelBody1: TFresnelBody;
+    FresnelDiv1: TFresnelDiv;
   private
 
   public
@@ -19,7 +21,7 @@ type
   end;
 
 var
-  FresnelForm1: TFresnelForm1;
+  FresnelForm2: TFresnelForm2;
 
 implementation
 

+ 0 - 6
demo/LazDesignerForm/demodesignerform1.lpi

@@ -43,12 +43,6 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
-      <Unit>
-        <Filename Value="FloatLayoutUnit1.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FresnelForm1"/>
-        <ResourceBaseClass Value="CustomForm"/>
-      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

+ 1 - 2
demo/LazDesignerForm/demodesignerform1.lpr

@@ -10,8 +10,7 @@ uses
   athreads,
   {$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, MainUnit, FloatLayoutUnit1
-  { you can add units after this };
+  Forms, MainUnit;
 
 {$R *.res}
 

+ 11 - 13
design/fresnelregister.pas

@@ -40,15 +40,15 @@ type
     procedure GetBounds(AComponent: TComponent; out CurBounds: TRect); override;
     procedure SetBounds(AComponent: TComponent; NewBounds: TRect); override;
     procedure GetClientArea(AComponent: TComponent; out
-            CurClientArea: TRect; out ScrollOffset: TPoint); override;
+                      CurClientArea: TRect; out ScrollOffset: TPoint); override;
     function GetComponentOriginOnForm(AComponent: TComponent): TPoint; override;
     procedure Paint; override;
     function ComponentIsIcon(AComponent: TComponent): boolean; override;
     function ComponentIsVisible(AComponent: TComponent): Boolean; override;
     function ComponentAtPos(p: TPoint; MinClass: TComponentClass;
-      Flags: TDMCompAtPosFlags): TComponent; override;
+                                Flags: TDMCompAtPosFlags): TComponent; override;
     function ParentAcceptsChild(Parent: TComponent;
-                Child: TComponentClass): boolean; override;
+                                ChildClass: TComponentClass): boolean; override;
   public
     // needed by Fresnel
     procedure InvalidateRect(Sender: TObject; ARect: TRect; Erase: boolean);
@@ -144,12 +144,10 @@ end;
 procedure TFresnelFormMediator.SetBounds(AComponent: TComponent;
   NewBounds: TRect);
 begin
-  debugln(['TFresnelFormMediator.SetBounds ',DbgSName(AComponent),' ',dbgs(NewBounds)]);
+  //debugln(['TFresnelFormMediator.SetBounds ',DbgSName(AComponent),' ',dbgs(NewBounds)]);
   if AComponent=FDsgnForm then
   begin
     FDsgnForm.FormBoundsRect:=NewBounds;
-    if LCLForm<>nil then
-      debugln(['TFresnelFormMediator.SetBounds lclform=',dbgs(LCLForm.BoundsRect)]);
   end else if AComponent is TFresnelElement then
   begin
     // bounds are controlled by CSS
@@ -227,21 +225,21 @@ begin
 end;
 
 function TFresnelFormMediator.ParentAcceptsChild(Parent: TComponent;
-  Child: TComponentClass): boolean;
+  ChildClass: TComponentClass): boolean;
 begin
-  debugln(['AAA1 TFresnelFormMediator.ParentAcceptsChild Parent=',DbgSName(Parent),' Child=',DbgSName(Child)]);
-  if Child.InheritsFrom(TControl) then
+  //debugln(['TFresnelFormMediator.ParentAcceptsChild START Parent=',DbgSName(Parent),' Child=',DbgSName(ChildClass)]);
+  if ChildClass.InheritsFrom(TControl) then
     Result:=false
-  else if Child.InheritsFrom(TFresnelViewport) then
+  else if ChildClass.InheritsFrom(TFresnelViewport) then
     Result:=false
   else if Parent is TFresnelElement then
   begin
     if Parent is TFresnelReplacedElement then
       exit(false);
-    Result:=Child.InheritsFrom(TFresnelElement);
+    Result:=ChildClass.InheritsFrom(TFresnelElement);
   end else
-    Result:=inherited ParentAcceptsChild(Parent, Child);
-  debugln(['AAA2 TFresnelFormMediator.ParentAcceptsChild Parent=',DbgSName(Parent),' Child=',DbgSName(Child),' Result=',Result]);
+    Result:=inherited ParentAcceptsChild(Parent, ChildClass);
+  //debugln(['TFresnelFormMediator.ParentAcceptsChild END Parent=',DbgSName(Parent),' Child=',DbgSName(ChildClass),' Result=',Result]);
 end;
 
 constructor TFresnelFormMediator.Create(AOwner: TComponent);