ver. 2.4.1

- Used new "modern" Styles available in Delphi 13.
- Added FrameViewer Package in package groups

Author: Carlo Barazzetta

Demo/Help/README.md

@@ -8,13 +8,13 @@ The integration was tested from **Delphi XE6** to **Delphi 13**: for older versi
 
 Use MarkdownHelpViewer.pas (located into AppInterface folder) in dpr:
 
-```Delphi
+```Pascal
   MarkdownHelpViewer in '..\..\AppInterface\MarkDownHelpViewer.pas',
 ```
 
 then specify the default file of the help:
 
-```Delphi
+```Pascal
   Application.HelpFile := ExtractFilePath(Application.ExeName)+'..\Help\Home.md';
 ```
 
@@ -27,7 +27,7 @@ so the interface can launch the viewer automatically.
 
 If you don't want to use the provided Setup you can register the location of the Viewer built by yourself and deployed to a specific location, for example:
 
-```Delphi
+```Pascal
 {$IFDEF WIN32}
   RegisterMDViewerLocation(ExtractFilePath(Application.ExeName)+
     '..\..\Bin32\MDHelpViewer.exe');
@@ -40,7 +40,7 @@ If you don't want to use the provided Setup you can register the location of the
 
 To test the application you can lauch the Home.md help using the menu About/Help: in the OnClick handler invoke the help:
 
-```Delphi
+```Pascal
 procedure TfmMain.HelpMenuItemClick(Sender: TObject);
 begin
   Application.HelpKeyword('home');
@@ -53,7 +53,7 @@ When the user press "F1" inside the application, the HelpSystem is invoked with
 
 Then the interface searches in the same folder of default file (specified into Application.HelpFile) the specific file using those rules:
 
-#### Rules of precedence:
+#### Rules of precedence to search filed based on Help keyword or Help Context:
 
 - first search a file named as the Keyword or the Context with any markdown extension (eg. 1000.md, MainForm.md)
 - Then, try the Help Name and the Keyword (eg.Home1000.md, HomeMainForm.md)

Ext/HTMLViewer/package/Rad Studio 13/FrameViewer.dproj

@@ -7,7 +7,7 @@
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>20.3</ProjectVersion>
+        <ProjectVersion>20.4</ProjectVersion>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">FrameViewer</ProjectName>
     </PropertyGroup>

Ext/SVGIconImageList/Source/FMX.SVGIconImageList.pas

@@ -47,7 +47,7 @@ interface
   ;
 
 const
-  SVGIconImageListVersion = '4.6.3';
+  SVGIconImageListVersion = '4.7.2';
   DEFAULT_SIZE = 32;
   ZOOM_DEFAULT = 100;
   SVG_INHERIT_COLOR = TAlphaColors.Null;
@@ -307,8 +307,12 @@ procedure TSVGIconBitmapItem.DrawSVGIcon;
 
 function TSVGIconBitmapItem.GetBitmap: TBitmapOfItem;
 begin
-  DrawSVGIcon;
   Result := inherited Bitmap;
+  //Draw SVG Icon only if not already drawn at the correct size
+  //to prevent infinite notification loop (DoChange/ClearCache/Timer cycle)
+  if (Result.Width <> Round(FWidth * Scale)) or
+     (Result.Height <> Round(FHeight * Scale)) then
+    DrawSVGIcon;
 end;
 
 function TSVGIconBitmapItem.GetDisplayName: string;
@@ -674,6 +678,8 @@ function TSVGIconImageList.InsertIcon(const AIndex: Integer;
 var
   LItem: TSVGIconSourceItem;
   LDest: TCustomDestinationItem;
+  LIconName: string;
+  LCount: Integer;
 begin
   LItem := Self.Source.Insert(AIndex) as TSVGIconSourceItem;
   Result := LItem;
@@ -682,7 +688,20 @@ function TSVGIconImageList.InsertIcon(const AIndex: Integer;
   LDest := Self.Destination.Insert(AIndex);
   if AIconName <> '' then
   begin
-    LItem.Name := AIconName;
+    LCount := 1;
+    LIconName := AIconName;
+    //Check dup Names
+    while true do
+    begin
+      if GetIconByName(LIconName) = nil then
+        break
+      else
+      begin
+        LIconName := AIconName+IntToStr(LCount);
+        Inc(LCount)
+      end;
+    end;
+    LItem.Name := LIconName;
     with LDest.Layers.Add do
       Name := AIconName;
   end;

Ext/SVGIconImageList/Source/SVGIconImageListBase.pas

@@ -49,7 +49,7 @@ interface
   /// <summary>
   ///   Current version of the SVGIconImageList library.
   /// </summary>
-  SVGIconImageListVersion = '4.6.3';
+  SVGIconImageListVersion = '4.7.2';
 
   /// <summary>
   ///   Default size (width and height) for icons in pixels.

Ext/StyledComponents/source/Vcl.ButtonStylesAttributes.pas

@@ -56,7 +56,7 @@ interface
 
 const
   /// <summary>Current version of the StyledComponents library</summary>
-  StyledComponentsVersion = '3.9.3';
+  StyledComponentsVersion = '4.0.0';
   /// <summary>Default corner radius for rounded buttons in pixels</summary>
   DEFAULT_RADIUS = 6;
   /// <summary>Resource name for the Windows shield admin icon</summary>

Ext/StyledComponents/source/Vcl.StandardButtonStyles.pas

@@ -2310,7 +2310,7 @@ function TStyledButtonRender.ApplyButtonStyle: Boolean;
 begin
   if AsVCLStyle then
   begin
-    //if StyleElements contains seClient then use
+    //if StyleElements contains seBorder then use
     //VCL Style assigned to Button or Global VCL Style
     if seBorder in FOwnerControl.StyleElements then
       LStyleAppearance := DEFAULT_APPEARANCE;
@@ -3935,8 +3935,6 @@ procedure TStyledButtonRender.SetStyleClass(
   begin
     if (LValue <> DEFAULT_WINDOWS_CLASS) then
       FOwnerControl.StyleElements := FOwnerControl.StyleElements - [seClient];
-//    else
-//      LValue := GetActiveStyleName;
     if LValue = '' then
       LValue := DEFAULT_WINDOWS_CLASS;
   end;
@@ -4008,7 +4006,7 @@ procedure TStyledButtonRender.Loaded;
 begin
   inherited;
   SetImageIndex(ImageIndex);
-  if not FStyleApplied (*and not HasCustomAttributes*) then
+  if not FStyleApplied then
   begin
     StyleFamilyUpdateAttributesByModalResult(FModalResult,
       FStyleFamily, FStyleClass, FStyleAppearance);