Skip to content

Commit

Permalink
Pull request EtheaDev#40 "Implemented CalcRect using the Delphi RTL a…
Browse files Browse the repository at this point in the history 
…s FittedRect" merged manually due to conflicts
  • Loading branch information
@carloBarazzetta
carloBarazzetta committed Aug 17, 2020
1 parent c7a6b52 commit 96c8a90
Show file tree
Hide file tree
Showing 31 changed files with 703 additions and 1,024 deletions.
1 change: 0 additions & 1 deletion Demo/Source/UIconPickerFMX.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ implementation

uses
Winapi.GDIPOBJ
, GDIPUtils
, Winapi.GDIPAPI
, SVGTypes;

Expand Down
13 changes: 8 additions & 5 deletions Demo/Source/UMain.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ procedure TMainForm.BuildFromFilesButtonClick(Sender: TObject);

procedure TMainForm.ChangeColorActionExecute(Sender: TObject);
begin
ColorDialog.Color := SVGColorToColor(SVGIconVirtualImageList.FixedColor);
ColorDialog.Color := SVGIconVirtualImageList.FixedColor;
if ColorDialog.Execute then
SVGIconVirtualImageList.FixedColor := ColorToSVGColor(ColorDialog.Color);
SVGIconVirtualImageList.FixedColor := ColorDialog.Color;
UpdateGUI;
end;

Expand Down Expand Up @@ -213,8 +213,11 @@ procedure TMainForm.FixedColorComboBoxSelect(Sender: TObject);
begin
Screen.Cursor := crHourGlass;
try
SVGIconVirtualImageList.FixedColor := SVGColorNameToSVGColor(FixedColorComboBox.Text);
UpdateGUI;
if FixedColorComboBox.ItemIndex >= 0 then begin
SVGIconVirtualImageList.FixedColor :=
TColor(FixedColorComboBox.Items.Objects[FixedColorComboBox.ItemIndex]);
UpdateGUI;
end;
finally
Screen.Cursor := crDefault;
end;
Expand Down Expand Up @@ -343,7 +346,7 @@ procedure TMainForm.updateGUI;
UpdateListView;
UpdateTreeView;
GrayScaleCheckBox.Checked := SVGIconVirtualImageList.GrayScale;
FixedColorComboBox.ItemIndex := FixedColorComboBox.Items.IndexOf(SVGColorToSVGColorName(SVGIconVirtualImageList.FixedColor));
FixedColorComboBox.ItemIndex := FixedColorComboBox.Items.IndexOfObject(TObject(SVGIconVirtualImageList.FixedColor));
finally
FUpdating := False;
end;
Expand Down
89 changes: 0 additions & 89 deletions GDIP/GDIPUtils.pas
View file

This file was deleted.

9 changes: 4 additions & 5 deletions Packages/D10_1/SVGIconPackage.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package SVGIconPackage;
{$IMAGEBASE $400000}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'Ethea SVGIconImageList VCL components'}
{$DESCRIPTION 'SVG Package for Ethea SVGIcon Components'}
{$LIBSUFFIX '_D10_1'}
{$RUNONLY}
{$IMPLICITBUILD OFF}
Expand All @@ -45,9 +45,8 @@ contains
SVGProperties in '..\..\Svg\SVGProperties.pas',
SVGStyle in '..\..\Svg\SVGStyle.pas',
SVGTypes in '..\..\Svg\SVGTypes.pas',
GDIPKerning in '..\..\GDIP\GDIPKerning.pas',
GDIPOBJ2 in '..\..\GDIP\GDIPOBJ2.pas',
GDIPPathText in '..\..\GDIP\GDIPPathText.pas',
GDIPUtils in '..\..\GDIP\GDIPUtils.pas';
GDIPKerning in '..\..\Svg\GDIPKerning.pas',
GDIPOBJ2 in '..\..\Svg\GDIPOBJ2.pas',
GDIPPathText in '..\..\Svg\GDIPPathText.pas';

end.
9 changes: 4 additions & 5 deletions Packages/D10_1/SVGIconPackage.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<DCC_Description>Ethea SVGIconImageList VCL components</DCC_Description>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DllSuffix>_D10_1</DllSuffix>
<DCC_UnitSearchPath>..\..\svg;..\..\GDIP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\svg;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
Expand Down Expand Up @@ -106,10 +106,9 @@
<DCCReference Include="..\..\Svg\SVGProperties.pas"/>
<DCCReference Include="..\..\Svg\SVGStyle.pas"/>
<DCCReference Include="..\..\Svg\SVGTypes.pas"/>
<DCCReference Include="..\..\GDIP\GDIPKerning.pas"/>
<DCCReference Include="..\..\GDIP\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\GDIP\GDIPPathText.pas"/>
<DCCReference Include="..\..\GDIP\GDIPUtils.pas"/>
<DCCReference Include="..\..\Svg\GDIPKerning.pas"/>
<DCCReference Include="..\..\Svg\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\Svg\GDIPPathText.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand Down
9 changes: 4 additions & 5 deletions Packages/D10_2/SVGIconPackage.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package SVGIconPackage;
{$IMAGEBASE $400000}
{$DEFINE RELEASE}
{$ENDIF IMPLICITBUILDING}
{$DESCRIPTION 'Ethea SVGIconImageList VCL components'}
{$DESCRIPTION 'SVG Package for Ethea SVGIcon Components'}
{$LIBSUFFIX '_D10_2'}
{$RUNONLY}
{$IMPLICITBUILD OFF}
Expand All @@ -45,9 +45,8 @@ contains
SVGProperties in '..\..\Svg\SVGProperties.pas',
SVGStyle in '..\..\Svg\SVGStyle.pas',
SVGTypes in '..\..\Svg\SVGTypes.pas',
GDIPKerning in '..\..\GDIP\GDIPKerning.pas',
GDIPOBJ2 in '..\..\GDIP\GDIPOBJ2.pas',
GDIPPathText in '..\..\GDIP\GDIPPathText.pas',
GDIPUtils in '..\..\GDIP\GDIPUtils.pas';
GDIPKerning in '..\..\Svg\GDIPKerning.pas',
GDIPOBJ2 in '..\..\Svg\GDIPOBJ2.pas',
GDIPPathText in '..\..\Svg\GDIPPathText.pas';

end.
9 changes: 4 additions & 5 deletions Packages/D10_2/SVGIconPackage.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<DCC_Description>Ethea SVGIconImageList VCL components</DCC_Description>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DllSuffix>_D10_2</DllSuffix>
<DCC_UnitSearchPath>..\..\svg;..\..\GDIP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\svg;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
Expand Down Expand Up @@ -106,10 +106,9 @@
<DCCReference Include="..\..\Svg\SVGProperties.pas"/>
<DCCReference Include="..\..\Svg\SVGStyle.pas"/>
<DCCReference Include="..\..\Svg\SVGTypes.pas"/>
<DCCReference Include="..\..\GDIP\GDIPKerning.pas"/>
<DCCReference Include="..\..\GDIP\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\GDIP\GDIPPathText.pas"/>
<DCCReference Include="..\..\GDIP\GDIPUtils.pas"/>
<DCCReference Include="..\..\Svg\GDIPKerning.pas"/>
<DCCReference Include="..\..\Svg\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\Svg\GDIPPathText.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand Down
7 changes: 3 additions & 4 deletions Packages/D10_3/SVGIconPackage.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ contains
SVGProperties in '..\..\Svg\SVGProperties.pas',
SVGStyle in '..\..\Svg\SVGStyle.pas',
SVGTypes in '..\..\Svg\SVGTypes.pas',
GDIPKerning in '..\..\GDIP\GDIPKerning.pas',
GDIPOBJ2 in '..\..\GDIP\GDIPOBJ2.pas',
GDIPPathText in '..\..\GDIP\GDIPPathText.pas',
GDIPUtils in '..\..\GDIP\GDIPUtils.pas';
GDIPKerning in '..\..\Svg\GDIPKerning.pas',
GDIPOBJ2 in '..\..\Svg\GDIPOBJ2.pas',
GDIPPathText in '..\..\Svg\GDIPPathText.pas';

end.
12 changes: 5 additions & 7 deletions Packages/D10_3/SVGIconPackage.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<DCC_Description>Ethea SVGIconImageList VCL components</DCC_Description>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DllSuffix>_D10_3</DllSuffix>
<DCC_UnitSearchPath>..\..\svg;..\..\GDIP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\svg;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
Expand Down Expand Up @@ -106,10 +106,9 @@
<DCCReference Include="..\..\Svg\SVGProperties.pas"/>
<DCCReference Include="..\..\Svg\SVGStyle.pas"/>
<DCCReference Include="..\..\Svg\SVGTypes.pas"/>
<DCCReference Include="..\..\GDIP\GDIPKerning.pas"/>
<DCCReference Include="..\..\GDIP\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\GDIP\GDIPPathText.pas"/>
<DCCReference Include="..\..\GDIP\GDIPUtils.pas"/>
<DCCReference Include="..\..\Svg\GDIPKerning.pas"/>
<DCCReference Include="..\..\Svg\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\Svg\GDIPPathText.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand All @@ -130,8 +129,7 @@
<Source>
<Source Name="MainSource">SVGIconPackage.dpk</Source>
</Source>
<Excluded_Packages>
</Excluded_Packages>
<Excluded_Packages/>
</Delphi.Personality>
<Platforms>
<Platform value="Win32">True</Platform>
Expand Down
7 changes: 3 additions & 4 deletions Packages/D10_4/SVGIconPackage.dpk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ contains
SVGProperties in '..\..\Svg\SVGProperties.pas',
SVGStyle in '..\..\Svg\SVGStyle.pas',
SVGTypes in '..\..\Svg\SVGTypes.pas',
GDIPKerning in '..\..\GDIP\GDIPKerning.pas',
GDIPOBJ2 in '..\..\GDIP\GDIPOBJ2.pas',
GDIPPathText in '..\..\GDIP\GDIPPathText.pas',
GDIPUtils in '..\..\GDIP\GDIPUtils.pas';
GDIPKerning in '..\..\Svg\GDIPKerning.pas',
GDIPOBJ2 in '..\..\Svg\GDIPOBJ2.pas',
GDIPPathText in '..\..\Svg\GDIPPathText.pas';

end.
9 changes: 4 additions & 5 deletions Packages/D10_4/SVGIconPackage.dproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<DCC_Description>Ethea SVGIconImageList VCL components</DCC_Description>
<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
<DllSuffix>_D10_4</DllSuffix>
<DCC_UnitSearchPath>..\..\svg;..\..\GDIP;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<DCC_UnitSearchPath>..\..\svg;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Base_Win32)'!=''">
Expand Down Expand Up @@ -106,10 +106,9 @@
<DCCReference Include="..\..\Svg\SVGProperties.pas"/>
<DCCReference Include="..\..\Svg\SVGStyle.pas"/>
<DCCReference Include="..\..\Svg\SVGTypes.pas"/>
<DCCReference Include="..\..\GDIP\GDIPKerning.pas"/>
<DCCReference Include="..\..\GDIP\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\GDIP\GDIPPathText.pas"/>
<DCCReference Include="..\..\GDIP\GDIPUtils.pas"/>
<DCCReference Include="..\..\Svg\GDIPKerning.pas"/>
<DCCReference Include="..\..\Svg\GDIPOBJ2.pas"/>
<DCCReference Include="..\..\Svg\GDIPPathText.pas"/>
<BuildConfiguration Include="Release">
<Key>Cfg_2</Key>
<CfgParent>Base</CfgParent>
Expand Down
Loading

0 comments on commit 96c8a90

Please sign in to comment.