circular patch:

- InnerMargin property for label and button (so that it is possible to make it look as before by using value 0.5 for InnerMargin)
- for sprite animation, when loading a gif, to use the speed of the gif file
- for sprite animation, fixed some resource variable

bcbutton.pas

@@ -105,6 +105,7 @@ type
     FFlipArrow: boolean;
     FActiveButt: TBCButtonStyle;
     FBGRANormal, FBGRAHover, FBGRAClick: TBGRABitmapEx;
+    FInnerMargin: single;
     FMemoryUsage: TBCButtonMemoryUsage;
     FRounding: TBCRounding;
     FRoundingDropDown: TBCRounding;
@@ -158,6 +159,7 @@ type
     procedure SetGlyphMargin(const AValue: integer);
     procedure SetImageIndex(AValue: integer);
     procedure SetImages(AValue: TCustomImageList);
+    procedure SetInnerMargin(AValue: single);
     procedure SetMemoryUsage(AValue: TBCButtonMemoryUsage);
     procedure SetRounding(AValue: TBCRounding);
     procedure SetRoundingDropDown(AValue: TBCRounding);
@@ -239,6 +241,7 @@ type
       read FOnAfterRenderBCButton write FOnAfterRenderBCButton;
     property OnButtonClick: TNotifyEvent read FOnButtonClick write FOnButtonClick;
     property MemoryUsage: TBCButtonMemoryUsage read FMemoryUsage write SetMemoryUsage;
+    property InnerMargin: single read FInnerMargin write SetInnerMargin;
   public
     { Constructor }
     constructor Create(AOwner: TComponent); override;
@@ -296,6 +299,7 @@ type
     { The margin of the glyph icon. }
     property GlyphMargin;
     property Hint;
+    property InnerMargin;
     { Called when the button finish the render. Use it to add your own drawings to the button. }
     property OnAfterRenderBCButton;
     { Called when the button part is clicked, not the dropdown. }
@@ -810,7 +814,8 @@ end;
 procedure TCustomBCButton.RenderState(ABGRA: TBGRABitmapEx;
   AState: TBCButtonState; const ARect: TRect; ARounding: TBCRounding);
 begin
-  RenderBackgroundAndBorder(ARect, AState.FBackground, TBGRABitmap(ABGRA), ARounding, AState.FBorder);
+  RenderBackgroundAndBorder(ARect, AState.FBackground, TBGRABitmap(ABGRA),
+    ARounding, AState.FBorder, FInnerMargin);
 end;
 
 procedure TCustomBCButton.OnChangeGlyph(Sender: TObject);
@@ -993,6 +998,14 @@ begin
   Invalidate;
 end;
 
+procedure TCustomBCButton.SetInnerMargin(AValue: single);
+begin
+  if FInnerMargin=AValue then Exit;
+  FInnerMargin:=AValue;
+  RenderControl;
+  Invalidate;
+end;
+
 procedure TCustomBCButton.SetMemoryUsage(AValue: TBCButtonMemoryUsage);
 begin
   if FMemoryUsage=AValue then Exit;

bclabel.pas

@@ -58,8 +58,10 @@ type
     FBGRA: TBGRABitmapEx;
     FBorder: TBCBorder;
     FFontEx: TBCFont;
+    FInnerMargin: single;
     FRounding: TBCRounding;
     procedure Render;
+    procedure SetInnerMargin(AValue: single);
     procedure SetRounding(AValue: TBCRounding);
     procedure UpdateSize;
     procedure SetBackground(AValue: TBCBackground);
@@ -86,6 +88,7 @@ type
     property Border: TBCBorder read FBorder write SetBorder;
     property FontEx: TBCFont read FFontEx write SetFontEx;
     property Rounding: TBCRounding read FRounding write SetRounding;
+    property InnerMargin: single read FInnerMargin write SetInnerMargin;
   public
     { Public declarations }
     constructor Create(AOwner: TComponent); override;
@@ -120,6 +123,7 @@ type
     property HelpKeyword;
     property HelpType;
     property Hint;
+    property InnerMargin;
     property Left;
     property PopupMenu;
     property Rounding;
@@ -167,7 +171,7 @@ begin
   r := FBGRA.ClipRect;
   CalculateBorderRect(FBorder,r);
 
-  RenderBackgroundAndBorder(FBGRA.ClipRect, FBackground, TBGRABitmap(FBGRA), FRounding, FBorder);
+  RenderBackgroundAndBorder(FBGRA.ClipRect, FBackground, TBGRABitmap(FBGRA), FRounding, FBorder, FInnerMargin);
   RenderText(FBGRA.ClipRect, FFontEx, Caption, TBGRABitmap(FBGRA));
 
   {$IFDEF DEBUG}
@@ -175,6 +179,14 @@ begin
   {$ENDIF}
 end;
 
+procedure TCustomBCLabel.SetInnerMargin(AValue: single);
+begin
+  if FInnerMargin=AValue then Exit;
+  FInnerMargin:=AValue;
+  RenderControl;
+  Invalidate;
+end;
+
 procedure TCustomBCLabel.SetRounding(AValue: TBCRounding);
 begin
   if FRounding = AValue then Exit;

bctools.pas

@@ -60,7 +60,7 @@ procedure RenderBackground(const ARect: TRect; ABackground: TBCBackground;
 procedure RenderBackgroundF(x1,y1,x2,y2: single; ABackground: TBCBackground;
   ATargetBGRA: TBGRABitmap; ARounding: TBCRounding = nil);
 procedure RenderBackgroundAndBorder(const ARect: TRect; ABackground: TBCBackground;
-  ATargetBGRA: TBGRABitmap; ARounding: TBCRounding; ABorder: TBCBorder);
+  ATargetBGRA: TBGRABitmap; ARounding: TBCRounding; ABorder: TBCBorder; AInnerMargin: single = 0);
 // Render customizable border (used e.g. by TBCButton, TBCPanel, TBCLabel)
 procedure RenderBorder(const ARect: TRect; ABorder: TBCBorder;
   ATargetBGRA: TBGRABitmap; ARounding: TBCRounding = nil);
@@ -116,14 +116,18 @@ end;
 
 procedure RenderBackgroundAndBorder(const ARect: TRect;
   ABackground: TBCBackground; ATargetBGRA: TBGRABitmap;
-  ARounding: TBCRounding; ABorder: TBCBorder);
+  ARounding: TBCRounding; ABorder: TBCBorder; AInnerMargin: single);
 var w: single;
 begin
   if ABorder.Style = bboNone then
-    RenderBackground(ARect,ABackground,ATargetBGRA,ARounding,True)
+  begin
+    w := AInnerMargin-0.5;
+    RenderBackgroundF(ARect.Left+w, ARect.Top+w, ARect.Right-1-w,
+          ARect.Bottom-1-w,ABackground,ATargetBGRA,ARounding);
+  end
   else
   begin
-    w := (ABorder.Width-1)/2;
+    w := (ABorder.Width-1)/2+AInnerMargin;
     RenderBackgroundF(ARect.Left+w,ARect.Top+w,ARect.Right-1-w,ARect.Bottom-1-w,ABackground,ATargetBGRA,ARounding);
     RenderBorderF(ARect.Left+w,ARect.Top+w,ARect.Right-1-w,ARect.Bottom-1-w,ABorder,ATargetBGRA,ARounding);
   end;
@@ -143,6 +147,7 @@ var
   rx,ry: Byte;
   ropt: TRoundRectangleOptions;
 begin
+  if (x1>x2) or (y1>y2) then exit;
   if ABorder.Style=bboNone then Exit;
 
   if ARounding = nil then
@@ -404,7 +409,7 @@ var
   rx,ry: Byte;
   ropt: TRoundRectangleOptions;
 begin
-
+  if (x1>=x2) or (y1>=y2) then exit;
   if ARounding = nil then
   begin
     rx   := 0;

bgraspriteanimation.pas

@@ -527,13 +527,16 @@ var
   TempBitmap: TBGRABitmap;
   n: integer;
 begin
-  TempBitmap := TBGRABitmap.Create(Gif.Width * Gif.Count, Gif.Height);
+  if Gif.Count = 0 then exit;
 
+  TempBitmap := TBGRABitmap.Create(Gif.Width * Gif.Count, Gif.Height);
   for n := 0 to Gif.Count do
   begin
     Gif.CurrentImage := n;
     TempBitmap.BlendImage(Gif.Width * n, 0, Gif.MemBitmap, boLinearBlend);
   end;
+
+  AnimSpeed := Gif.TotalAnimationTimeMs div Gif.Count;
   FSpriteCount := Gif.Count;
   FSprite.Width := Gif.Width * Gif.Count;
   FSprite.Height := Gif.Height;
@@ -549,7 +552,7 @@ var
   TempGif: TBGRAAnimatedGif;
 begin
   TempGif := TBGRAAnimatedGif.Create;
-  TempGif.LoadFromResourceName(HInstance, ResName);
+  TempGif.LoadFromResourceName(Instance, ResName);
 
   GifImageToSprite(TempGif);