*Fixed rendering on TButton!

*Fixed rendering with Delphi7

Author: carloBarazzetta

Packages/IconFontsImageListEditorUnit.dfm

@@ -394,7 +394,6 @@ object IconFontsImageListEditor: TIconFontsImageListEditor
             Align = alClient
             Stretch = True
             Transparent = True
-            ExplicitLeft = 6
           end
         end
         object IconName: TEdit

Source/IconFontsCharMapUnit.pas

@@ -47,7 +47,7 @@ interface
   , ExtDlgs
   , Spin
   , IconFontsImageList
-  , ActnList, System.Actions
+  , ActnList
   ;
 
 type

Source/IconFontsImage.pas

@@ -38,9 +38,9 @@ interface
 {$IFDEF GDI+}
   , Winapi.GDIPOBJ
 {$ENDIF}
-  , System.Classes
-  , Vcl.Graphics
-  , Vcl.Controls
+  , Classes
+  , Graphics
+  , Controls
   , IconFontsImageList;
 
 type
@@ -225,8 +225,13 @@ procedure TIconFontImage.Paint;
     end
     else
     begin
+      {$IFDEF DXE8+}
       LBounds.Width := Round(ImageWidth * FScale);
       LBounds.Height := Round(ImageHeight * FScale);
+      {$ELSE}
+      LBounds.Right := Round(ImageWidth * FScale);
+      LBounds.Bottom := Round(ImageHeight * FScale);
+      {$ENDIF}
     end;
   end;
 
@@ -245,8 +250,13 @@ procedure TIconFontImage.Paint;
     LBounds.Top := 0;
     if FCenter then
     begin
+      {$IFDEF DXE8+}
       LBounds.Left := Round((Width - LBounds.Width) / 2);
-      LBounds. Top := Round((Height - LBounds.Height) / 2);
+      LBounds.Top := Round((Height - LBounds.Height) / 2);
+      {$ELSE}
+      LBounds.Left := Round((Width - LBounds.Right - LBounds.Left) / 2);
+      LBounds.Top := Round((Height - LBounds.Bottom - LBounds.Top) / 2);
+      {$ENDIF}
     end;
     {$ENDIF}
   end;
@@ -310,9 +320,15 @@ procedure TIconFontImage.Paint;
       LGraphics.Free;
     end;
     {$ELSE}
-    LIconFont.PaintTo(Self.Canvas,
-      LBounds.Left, LBounds.Top, LBounds.Width, LBounds.Height, LFontName,
-        LFontIconDec, LFontColor, LMaskColor, Enabled, LDisabledFactor);
+      {$IFDEF DXE8+}
+      LIconFont.PaintTo(Self.Canvas,
+        LBounds.Left, LBounds.Top, LBounds.Width, LBounds.Height, LFontName,
+          LFontIconDec, LFontColor, LMaskColor, Enabled, LDisabledFactor);
+      {$ELSE}
+      LIconFont.PaintTo(Self.Canvas,
+        LBounds.Left, LBounds.Top, LBounds.Right - LBounds.Left, LBounds.Bottom - LBounds.Top, LFontName,
+          LFontIconDec, LFontColor, LMaskColor, Enabled, LDisabledFactor);
+      {$ENDIF}
     {$ENDIF}
   end;
 

Source/IconFontsImageList.pas

@@ -54,7 +54,7 @@ interface
   ERR_ICONFONTS_FONT_NOT_INSTALLED = 'Font "%s" is not installed!';
 
 const
-  IconFontsImageListVersion = '2.0.0';
+  IconFontsImageListVersion = '2.1.0';
   DEFAULT_SIZE = 16;
 
 type
@@ -324,58 +324,7 @@ implementation
   , StrUtils
   ;
 
-
 {$IFDEF GDI+}
-(*
-type
-  TBoxAlignment = (baTopLeft, baTopCenter, baTopRight,
-    baCenterLeft, baCenterCenter, baCenterRight,
-    baBottomLeft, baBottomCenter, baBottomRight);
-
-function CalcRect(const Bounds: TGPRectF; const Width, Height: Double;
-  const Alignment: TBoxAlignment): TGPRectF;
-var
-  R: Double;
-begin
-  if Height > 0 then
-    R :=  Width / Height
-  else
-    R := 1;
-
-  if (Bounds.Height <> 0) and
-     (Bounds.Width / Bounds.Height > R) then
-  begin
-    Result.Width := Bounds.Height * R;
-    Result.Height := Bounds.Height;
-  end else
-  begin
-    Result.Width := Bounds.Width;
-    Result.Height := Bounds.Width / R;
-  end;
-
-  case Alignment of
-    baTopCenter, baCenterCenter, baBottomCenter:
-      Result.X := (Bounds.Width - Result.Width) / 2;
-    baTopRight, baCenterRight, baBottomRight:
-      Result.X := Bounds.Width - Result.Width;
-    else
-      Result.X := 0;
-  end;
-
-  case Alignment of
-    baCenterLeft, baCenterCenter, baCenterRight:
-      Result.Y := (Bounds.Height - Result.Height) / 2;
-    baBottomLeft, baBottomCenter, baBottomRight:
-      Result.Y := Bounds.Height - Result.Height;
-    else
-      Result.Y := 0;
-  end;
-
-  Result.X := Result.X + Bounds.X;
-  Result.Y := Result.Y + Bounds.Y;
-end;
-*)
-
 function GPColor(Col: TColor; Alpha: Byte): TGPColor;
 
 type
@@ -517,26 +466,7 @@ procedure TIconFontsImageList.SetDisabledFactor(const Value: Byte);
 {$IFDEF GDI+}
 procedure TIconFontsImageList.DoDraw(Index: Integer; Canvas: TCanvas; X, Y: Integer;
   Style: Cardinal; Enabled: Boolean);
-(*
-var
-  LMasked: Boolean;
-  LDrawingStyle: TDrawingStyle;
-  LStyle: Longint;
-  I: Integer;
-*)
-begin
-(*
-    LMasked := (Style and Cardinal(ILD_MASK)) <> 0;
-    LStyle := LongInt(Style) and not LongInt(ILD_MASK);
-    case LStyle of
-      ILD_FOCUS: LDrawingStyle := TDrawingStyle.dsFocus;
-      ILD_SELECTED: LDrawingStyle := TDrawingStyle.dsSelected;
-      ILD_NORMAL: LDrawingStyle := TDrawingStyle.dsNormal;
-      ILD_TRANSPARENT: LDrawingStyle := TDrawingStyle.dsTransparent;
-    else
-      LDrawingStyle := TDrawingStyle.dsNormal;
-    end;
-*)
+begin
   PaintTo(Canvas, Index, X, Y, Width, Height, Enabled);
 end;
 
@@ -737,6 +667,9 @@ procedure TIconFontsImageList.ClearIcons;
 constructor TIconFontsImageList.Create(AOwner: TComponent);
 begin
   inherited;
+  {$IFDEF D2010+}
+  ColorDepth := cd32Bit;
+  {$ENDIF}
   FStopDrawing := 0;
   FFontColor := clNone;
   FMaskColor := clNone;
@@ -1714,7 +1647,7 @@ procedure TIconFont.PaintTo(const ACanvas: TCanvas;
     {$WARN SYMBOL_DEPRECATED ON}
     TextOut(X, Y, S);
     {$ELSE}
-    S := WideChar(FFontIconDec);
+    S := WideChar(AFontIconDec);
     TextOutW(ACanvas.Handle, X, Y, PWideChar(S), 1);
     {$ENDIF}
   end;