*Fixed issue #111 "Partly ugly antialiasing effects"

EtheaDev · Sep 16, 2020 · bfedc67 · bfedc67
1 parent a23fac8
commit bfedc67
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/Demo/Source/UDataModule.pas b/Demo/Source/UDataModule.pas
@@ -31,7 +31,6 @@ interface
 
 uses
   System.SysUtils, System.Classes,
-  Vcl.BaseImageCollection, //if you are compiling with older version than 10.3 remove this line
   SVGIconImageCollection;
 
 type

diff --git a/Demo/Source/UMain.pas b/Demo/Source/UMain.pas
@@ -40,7 +40,6 @@ interface
   System.Actions,
   System.ImageList, //if you are compiling with older version than XE7 remove this line
   SVGIconImageListBase, SVGIconImageCollection, SVGIconVirtualImageList,
-  {$IFDEF D10_3+}Vcl.VirtualImageList,{$ENDIF}
   UDataModule;
 
 type
@@ -303,7 +302,7 @@ procedure TMainForm.SelectThemeRadioGroupClick(Sender: TObject);
     LStyleName := SelectThemeRadioGroup.Items[SelectThemeRadioGroup.ItemIndex];
     {$IFDEF DXE+}
     TStyleManager.TrySetStyle(LStyleName);
-    //UpdateIconFontsColorByStyle(IconFontsImageList); TODO
+    ImageDataModule.SVGIconImageCollection.Change;
     {$ELSE}
     SelectThemeRadioGroup.Visible := False;
     {$ENDIF}

diff --git a/Demo/Source/UMainNew.pas b/Demo/Source/UMainNew.pas
@@ -270,7 +270,7 @@ procedure TMainForm.SelectThemeRadioGroupClick(Sender: TObject);
     LStyleName := SelectThemeRadioGroup.Items[SelectThemeRadioGroup.ItemIndex];
     if TStyleManager.ActiveStyle.Name <> LStyleName then
       TStyleManager.TrySetStyle(LStyleName);
-    //UpdateIconFontsColorByStyle(IconFontsImageList); TODO
+    ImageDataModule.SVGIconImageCollection.Change;
     UpdateGUI(False);
   finally
     Screen.Cursor := crDefault;

diff --git a/Source/SVGIconImageCollection.pas b/Source/SVGIconImageCollection.pas
@@ -87,6 +87,8 @@   TSVGIconImageCollection = class(TComponent)
     function GetNameByIndex(AIndex: Integer): String; override;
     function GetBitmap(AIndex: Integer; AWidth, AHeight: Integer): TBitmap; override;
     procedure Draw(ACanvas: TCanvas; ARect: TRect; AIndex: Integer; AProportional: Boolean = False); override;
+    {$ELSE}
+    procedure Change;
     {$ENDIF}
 
     constructor Create(AOwner: TComponent); override;
@@ -408,6 +410,12 @@ procedure TSVGIconImageCollection.Draw(ACanvas: TCanvas; ARect: TRect; AIndex: I
 
   LSVG.PaintTo(ACanvas.Handle, TRectF.Create(ARect), AProportional);
 end;
+{$ELSE}
+procedure TSVGIconImageCollection.Change;
+begin
+  FSVGItems.BeginUpdate;
+  FSVGItems.EndUpdate;
+end;
 {$ENDIF}
 
 end.
diff --git a/Source/SVGIconItems.pas b/Source/SVGIconItems.pas
@@ -107,6 +107,7 @@ implementation
 
 uses
   System.SysUtils,
+  VCL.Themes,
 {$IFDEF D10_3+}
   BaseImageCollection,
 {$ENDIF}
@@ -169,7 +170,10 @@ function TSVGIconItem.GetBitmap(const AWidth, AHeight: Integer;
 
   Result := TBitmap.Create;
   Result.PixelFormat := pf32bit;
-  Result.Canvas.Brush.Color := $00FFFFFF;
+  if TStyleManager.IsCustomStyleActive then
+    Result.Canvas.Brush.Color := StyleServices.GetSystemColor(clWindow)
+  else
+    Result.Canvas.Brush.Color := clWindow;
   Result.SetSize(AWidth, AHeight);
 
   FSVG.PaintTo(Result.Canvas.Handle, TRectF.Create(0, 0, AWidth, AHeight));
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ interface @@
     uses
       System.SysUtils, System.Classes,
-      Vcl.BaseImageCollection, //if you are compiling with older version than 10.3 remove this line
       SVGIconImageCollection;
     type
@@ Expand Down @@