Ver Fonte

clean up

mattias há 2 dias atrás
pai
commit
06065d22af

+ 0 - 5
demo/Inspector/InspectorDemo.lpi

@@ -55,11 +55,6 @@
         <ResourceBaseClass Value="Other"/>
         <ResourceBaseClassname Value="TFresnelForm"/>
       </Unit>
-      <Unit>
-        <Filename Value="fresnel.cssstyleinspector.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="Fresnel.CSSStyleInspector"/>
-      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

+ 2 - 7
src/base/fresnel.cssstyleinspector.pas

@@ -3,6 +3,7 @@
     - "all: initial"
     - text-decoration
     - mark overwritten
+    - expand/collapse shorthand
     - color box
     - edit value
     - delete attribute
@@ -26,7 +27,6 @@ type
   protected
     procedure DoRender(aRenderer: IFresnelRenderer); override;
   public
-    procedure ComputeCSSLayoutFinished; override;
   end;
 
   { TCSSInspBoxModel }
@@ -125,6 +125,7 @@ begin
   h:=Min(R.Width,R.Height);
   w:=h*0.66;
 
+  Points:=[];
   SetLength(Points,3);
   Points[0].X:=R.Left+(r.Width-w)/2;
   Points[0].Y:=R.Top+(r.Height-h)/2;
@@ -136,12 +137,6 @@ begin
   aRenderer.Polygon(colWhite,@Points[0],3);
 end;
 
-procedure TCSSInspDropArrow.ComputeCSSLayoutFinished;
-begin
-  inherited ComputeCSSLayoutFinished;
-  writeln('TCSSInspDropArrow.ComputeCSSLayoutFinished ',UsedBorderBox.ToString);
-end;
-
 { TCSSInspBoxModel }
 
 procedure TCSSInspBoxModel.SetMarginColor(AValue: TFPColor);

+ 2 - 8
src/base/fresnel.images.pas

@@ -768,7 +768,6 @@ begin
   Result:=DoGetRawImage(aIndex,aResolution,False);
 end;
 
-
 procedure TBaseCustomImageList.SetImage(aIndex: Integer; aResolution: Word; aImage: TFPCustomImage);
 
 var
@@ -1023,7 +1022,6 @@ begin
   FCache.Clear;
 end;
 
-
 { TImageData }
 
 function TImageData.GetHeight: Word;
@@ -1046,7 +1044,6 @@ begin
   Result:=(FImageSource=isImageList) and assigned(FImageList);
 end;
 
-
 function TImageData.GetImageNameStored: Boolean;
 begin
   Result:=(FImageSource=isStore) and (FImageName<>'');
@@ -1277,8 +1274,6 @@ begin
   FImageName:=AValue;
 end;
 
-
-
 procedure TImageData.WriteData(Writer: TWriter);
 
 Const
@@ -1354,7 +1349,7 @@ end;
 procedure TImageData.DefineProperties(Filer: TFiler);
 begin
   inherited DefineProperties(Filer);
-  Filer.DefineProperty('Data',@ReadData,@WriteData,(FImageSource=isData) and (Width<>0) and (Height<>0));
+  Filer.DefineProperty('Data',@ReadData,@WriteData,(FImageSource=isData) and (Width>0) and (Height>0));
 end;
 
 procedure TImageData.LoadFromFile(const aFilename: String);
@@ -1366,9 +1361,8 @@ begin
   Img:=CreateData(0,0);
   try
     Img.LoadFromFile(aFileName);
-  except
+  finally
     Img.Free;
-    Raise;
   end;
   ReplaceData(Img);
 end;

+ 4 - 0
src/wasm/fresnel.lexeme.pp

@@ -14,6 +14,10 @@
  **********************************************************************}
 unit Fresnel.Lexeme;
 
+{$IF FPC_FULLVERSION>30300}
+  {$WARN 6060 off : Case statement does not handle all possible cases}
+{$ENDIF}
+
 interface
 
 (*