Add all changes from 5.0.1 to 5.0.3

bcbutton.pas

@@ -421,7 +421,7 @@ procedure Register;
 begin
   {$I images\bgracontrols_images.lrs}
   //{$I icons\bcbutton_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBCButton]);
+  RegisterComponents('BGRA Button Controls', [TBCButton]);
   RegisterPropertyEditor(TypeInfo(integer), TBCButton,
     'ImageIndex', TBCButtonImageIndexPropertyEditor);
 end;

bcbuttonfocus.pas

@@ -426,7 +426,7 @@ end;
 procedure Register;
 begin
   //{$I icons\bcbuttonfocus_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBCButtonFocus]);
+  RegisterComponents('BGRA Button Controls', [TBCButtonFocus]);
   {$IFDEF FPC}
   RegisterPropertyEditor(TypeInfo(integer), TBCButtonFocus,
     'ImageIndex', TBCButtonImageIndexPropertyEditor);

bcimagebutton.pas

@@ -374,9 +374,9 @@ begin
   {$IFDEF FPC}
   {$I icons\bcimagebutton_icon.lrs}
   {$ENDIF}
-  RegisterComponents('BGRA Controls', [TBCImageButton]);
+  RegisterComponents('BGRA Button Controls', [TBCImageButton]);
   //{$I icons\bcxbutton_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBCXButton]);
+  RegisterComponents('BGRA Button Controls', [TBCXButton]);
 end;
 {$ENDIF}
 
@@ -947,6 +947,9 @@ begin
   if FAnimation = AValue then
     Exit;
   FAnimation := AValue;
+
+  if csDesigning in ComponentState then Exit;
+    FTimer.Enabled := FAnimation;
 end;
 
 procedure TBCCustomImageButton.SetFBitmapFile(AValue: string);
@@ -1117,20 +1120,23 @@ begin
     FDestRect := Rect(0, 0, Width, Height);
 
     { Draw default style in cache bitmaps }
-    FBGRANormal.Rectangle(0, 0, Width, Height, BGRABlack, BGRA(0, 0, 255),
+    FBGRANormal.Rectangle(0, 0, Width, Height, BGRA(173, 173, 173), BGRA(225, 225, 225),
       dmSet);
-    FBGRAHover.Rectangle(0, 0, Width, Height, BGRABlack, BGRA(0, 255, 0),
+    FBGRAHover.Rectangle(0, 0, Width, Height, BGRA(0, 120, 215), BGRA(229, 241, 251),
       dmSet);
-    FBGRAActive.Rectangle(0, 0, Width, Height, BGRABlack, BGRA(255, 0, 0),
+    FBGRAActive.Rectangle(0, 0, Width, Height, BGRA(0, 84, 153), BGRA(204, 228, 247),
       dmSet);
-    FBGRADisabled.Rectangle(0, 0, Width, Height, BGRABlack, BGRA(100, 100, 100),
+    FBGRADisabled.Rectangle(0, 0, Width, Height, BGRA(191, 191, 191), BGRA(204, 204, 204),
       dmSet);
 
-    { Draw Text }
-    DrawText(FBGRANormal);
-    DrawText(FBGRAHover);
-    DrawText(FBGRAActive);
-    DrawText(FBGRADisabled);
+    if TextVisible then
+    begin
+      { Draw Text }
+      DrawText(FBGRANormal);
+      DrawText(FBGRAHover);
+      DrawText(FBGRAActive);
+      DrawText(FBGRADisabled);
+    end;
   end;
 
   {$IFDEF INDEBUG}
@@ -1272,6 +1278,8 @@ begin
     FTimer := TTimer.Create(Self);
     FTimer.Interval := 15;
     FTimer.OnTimer := Fade;
+    if csDesigning in ComponentState then
+      FTimer.Enabled := False;
     FAnimation := True;
     FTextVisible := True;
 
@@ -1287,6 +1295,8 @@ end;
 
 destructor TBCCustomImageButton.Destroy;
 begin
+  FTimer.Enabled := False;
+  FTimer.OnTimer := nil;
   FTimer.Free;
   if FBGRAMultiSliceScaling <> nil then
     FreeAndNil(FBGRAMultiSliceScaling);

bcmaterialdesignbutton.pas

@@ -183,7 +183,7 @@ end;
 {$IFDEF FPC}procedure Register;
 begin
   //{$I icons\bcmaterialdesignbutton_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBCMaterialDesignButton]);
+  RegisterComponents('BGRA Button Controls', [TBCMaterialDesignButton]);
 end;
 {$ENDIF}
 

bcmdbutton.pas

@@ -232,7 +232,7 @@ var
 {$IFDEF FPC}
 procedure Register;
 begin
-  RegisterComponents('BGRA Controls', [TBCMDButton]);
+  RegisterComponents('BGRA Button Controls', [TBCMDButton]);
 end;
 {$ENDIF}
 

bcmdbuttonfocus.pas

@@ -180,7 +180,7 @@ var
 {$IFDEF FPC}
 procedure Register;
 begin
-  RegisterComponents('BGRA Controls', [TBCMDButtonFocus]);
+  RegisterComponents('BGRA Button Controls', [TBCMDButtonFocus]);
 end;
 {$ENDIF}
 

bcsvgviewer.pas

@@ -212,22 +212,22 @@ end;
 
 function TBCSVGViewer.GetSVGRectF: TRectF;
 var
-  vb: TSVGViewBox;
+  vbSize: TPointF;
 
   procedure NoStretch(AX,AY: single);
   begin
     case HorizAlign of
-      taCenter: result.Left := (Width-vb.size.x)/2;
-      taRightJustify: result.Left := Width-AX-vb.size.x;
+      taCenter: result.Left := (Width-vbSize.x)/2;
+      taRightJustify: result.Left := Width-AX-vbSize.x;
       else {taLeftJustify} result.Left := AX;
     end;
     case VertAlign of
-      tlCenter: result.Top := (Height-vb.size.y)/2;
-      tlBottom: result.Top := Height-AY-vb.size.y;
+      tlCenter: result.Top := (Height-vbSize.y)/2;
+      tlBottom: result.Top := Height-AY-vbSize.y;
       else {tlTop} result.Top := AY;
     end;
-    result.Right := result.Left+vb.size.x;
-    result.Bottom := result.Top+vb.size.y;
+    result.Right := result.Left+vbSize.x;
+    result.Bottom := result.Top+vbSize.y;
   end;
 
 begin
@@ -236,10 +236,10 @@ begin
 
   FSVG.Units.ContainerWidth := FloatWithCSSUnit(Width*FSVG.Units.DpiX/DestDPI,cuPixel);
   FSVG.Units.ContainerHeight := FloatWithCSSUnit(Height*FSVG.Units.DpiY/DestDPI,cuPixel);
-  vb := FSVG.ViewBoxInUnit[cuPixel];
-  vb.size.x := vb.size.x *(DestDPI/FSVG.Units.DpiX);
-  vb.size.y := vb.size.y *(DestDPI/FSVG.Units.DpiY);
-  if ((StretchMode = smShrink) and ((vb.size.x > Width+0.1) or (vb.size.y > Height+0.1))) or
+  vbSize := FSVG.ViewSizeInUnit[cuPixel];
+  vbSize.x *= DestDPI/FSVG.Units.DpiX;
+  vbSize.y *= DestDPI/FSVG.Units.DpiY;
+  if ((StretchMode = smShrink) and ((vbSize.x > Width+0.1) or (vbSize.y > Height+0.1))) or
      (StretchMode = smStretch) then
   begin
     if Proportional then
@@ -248,12 +248,12 @@ begin
     if StretchMode = smShrink then
     begin
       NoStretch(0,0);
-      if vb.size.x > Width then
+      if vbSize.x > Width then
       begin
         result.Left := 0;
         result.Right := Width;
       end;
-      if vb.size.y > Height then
+      if vbSize.y > Height then
       begin
         result.Top := 0;
         result.Bottom := Height;

bgracontrols.lpk

@@ -33,7 +33,7 @@
     </CompilerOptions>
     <Description Value="BGRA Controls is a set of graphical UI elements that you can use with Lazarus LCL applications."/>
     <License Value="Modified LGPL"/>
-    <Version Major="5" Release="1"/>
+    <Version Major="6"/>
     <Files Count="47">
       <Item1>
         <Filename Value="bcbasectrls.pas"/>
@@ -99,169 +99,169 @@
         <UnitName Value="BCMaterialDesignButton"/>
       </Item13>
       <Item14>
+        <Filename Value="bcmdbutton.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="BCMDButton"/>
+      </Item14>
+      <Item15>
+        <Filename Value="bcmdbuttonfocus.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="BCMDButtonFocus"/>
+      </Item15>
+      <Item16>
         <Filename Value="bcnumerickeyboard.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="BCNumericKeyboard"/>
-      </Item14>
-      <Item15>
+      </Item16>
+      <Item17>
         <Filename Value="bcpanel.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCPanel"/>
-      </Item15>
-      <Item16>
+      </Item17>
+      <Item18>
         <Filename Value="bcradialprogressbar.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCRadialProgressBar"/>
-      </Item16>
-      <Item17>
+      </Item18>
+      <Item19>
         <Filename Value="bcrtti.pas"/>
         <UnitName Value="BCRTTI"/>
-      </Item17>
-      <Item18>
+      </Item19>
+      <Item20>
         <Filename Value="bcsamples.pas"/>
         <UnitName Value="BCSamples"/>
-      </Item18>
-      <Item19>
+      </Item20>
+      <Item21>
         <Filename Value="bcstylesform.pas"/>
         <UnitName Value="BCStylesForm"/>
-      </Item19>
-      <Item20>
+      </Item21>
+      <Item22>
         <Filename Value="bcsvgbutton.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCSVGButton"/>
-      </Item20>
-      <Item21>
+      </Item22>
+      <Item23>
         <Filename Value="bcsvgviewer.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCSVGViewer"/>
-      </Item21>
-      <Item22>
+      </Item23>
+      <Item24>
         <Filename Value="bcthememanager.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="BCThemeManager"/>
-      </Item22>
-      <Item23>
+      </Item24>
+      <Item25>
         <Filename Value="bctoolbar.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCToolBar"/>
-      </Item23>
-      <Item24>
+      </Item25>
+      <Item26>
         <Filename Value="bctools.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="BCTools"/>
-      </Item24>
-      <Item25>
+      </Item26>
+      <Item27>
         <Filename Value="bctrackbarupdown.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BCTrackbarUpdown"/>
-      </Item25>
-      <Item26>
+      </Item27>
+      <Item28>
         <Filename Value="bctypes.pas"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="BCTypes"/>
-      </Item26>
-      <Item27>
+      </Item28>
+      <Item29>
         <Filename Value="bgracustomdrawn.pas"/>
         <UnitName Value="BGRACustomDrawn"/>
-      </Item27>
-      <Item28>
+      </Item29>
+      <Item30>
         <Filename Value="bgraflashprogressbar.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAFlashProgressBar"/>
-      </Item28>
-      <Item29>
+      </Item30>
+      <Item31>
         <Filename Value="bgragraphiccontrol.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAGraphicControl"/>
-      </Item29>
-      <Item30>
+      </Item31>
+      <Item32>
         <Filename Value="bgraimagelist.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAImageList"/>
-      </Item30>
-      <Item31>
+      </Item32>
+      <Item33>
         <Filename Value="bgraimagemanipulation.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAImageManipulation"/>
-      </Item31>
-      <Item32>
+      </Item33>
+      <Item34>
         <Filename Value="bgraknob.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAKnob"/>
-      </Item32>
-      <Item33>
+      </Item34>
+      <Item35>
         <Filename Value="bgraresizespeedbutton.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAResizeSpeedButton"/>
-      </Item33>
-      <Item34>
+      </Item35>
+      <Item36>
         <Filename Value="bgrashape.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAShape"/>
-      </Item34>
-      <Item35>
+      </Item36>
+      <Item37>
         <Filename Value="bgraspeedbutton.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRASpeedButton"/>
-      </Item35>
-      <Item36>
+      </Item37>
+      <Item38>
         <Filename Value="bgraspriteanimation.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRASpriteAnimation"/>
-      </Item36>
-      <Item37>
+      </Item38>
+      <Item39>
         <Filename Value="bgravirtualscreen.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="BGRAVirtualScreen"/>
-      </Item37>
-      <Item38>
+      </Item39>
+      <Item40>
         <Filename Value="colorspeedbutton.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="ColorSpeedButton"/>
-      </Item38>
-      <Item39>
+      </Item40>
+      <Item41>
         <Filename Value="dtanalogclock.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="DTAnalogClock"/>
-      </Item39>
-      <Item40>
-        <Filename Value="dtthemedclock.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="dtthemedclock"/>
-      </Item40>
-      <Item41>
-        <Filename Value="materialcolors.pas"/>
-        <UnitName Value="MaterialColors"/>
       </Item41>
       <Item42>
-        <Filename Value="mouseandkeyinput/mouseandkeyinput.pas"/>
-        <AddToUsesPkgSection Value="False"/>
-        <UnitName Value="MouseAndKeyInput"/>
+        <Filename Value="dtanalogcommon.pas"/>
+        <UnitName Value="DTAnalogCommon"/>
       </Item42>
       <Item43>
-        <Filename Value="bcmdbutton.pas"/>
+        <Filename Value="dtanaloggauge.pas"/>
         <HasRegisterProc Value="True"/>
-        <UnitName Value="BCMDButton"/>
+        <AddToUsesPkgSection Value="False"/>
+        <UnitName Value="DTAnalogGauge"/>
       </Item43>
       <Item44>
-        <Filename Value="bcmdbuttonfocus.pas"/>
+        <Filename Value="dtthemedclock.pas"/>
         <HasRegisterProc Value="True"/>
-        <UnitName Value="BCMDButtonFocus"/>
+        <UnitName Value="dtthemedclock"/>
       </Item44>
       <Item45>
-        <Filename Value="dtanalogcommon.pas"/>
-        <UnitName Value="DTAnalogCommon"/>
+        <Filename Value="dtthemedgauge.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="dtthemedgauge"/>
       </Item45>
       <Item46>
-        <Filename Value="dtanaloggauge.pas"/>
-        <HasRegisterProc Value="True"/>
-        <AddToUsesPkgSection Value="False"/>
-        <UnitName Value="DTAnalogGauge"/>
+        <Filename Value="materialcolors.pas"/>
+        <UnitName Value="MaterialColors"/>
       </Item46>
       <Item47>
-        <Filename Value="dtthemedgauge.pas"/>
-        <HasRegisterProc Value="True"/>
-        <UnitName Value="dtthemedgauge"/>
+        <Filename Value="mouseandkeyinput/mouseandkeyinput.pas"/>
+        <AddToUsesPkgSection Value="False"/>
+        <UnitName Value="MouseAndKeyInput"/>
       </Item47>
     </Files>
     <RequiredPkgs Count="2">

bgraflashprogressbar.pas

@@ -171,7 +171,6 @@ procedure TBGRAFlashProgressBar.Paint;
 var
   content: TRect;
   xpos, y, tx, ty: integer;
-  grayValue: integer;
   bgColor: TBGRAPixel;
 
   function ApplyLightness(c: TBGRAPixel; lightness: word): TBGRAPixel;

bgraresizespeedbutton.pas

@@ -107,7 +107,7 @@ end;
 procedure Register;
 begin
   //{$I icons\bgraresizespeedbutton_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBGRAResizeSpeedButton]);
+  RegisterComponents('BGRA Button Controls', [TBGRAResizeSpeedButton]);
 end;
 {$ENDIF}
 

bgraspeedbutton.pas

@@ -66,8 +66,8 @@ type
     { Protected declarations }
     {$IFDEF BGRA_DRAW}
     function DrawGlyph(ACanvas: TCanvas; const AClient: TRect;
-      const AOffset: TPoint; AState: TButtonState; ATransparent: boolean;
-      BiDiFlags: longint): TRect; override;
+      const AOffset: TPoint; AState: TButtonState; {%H-}ATransparent: boolean;
+      {%H-}BiDiFlags: longint): TRect; override;
     {$ENDIF}
   public
     { Public declarations }
@@ -87,7 +87,7 @@ implementation
 procedure Register;
 begin
   //{$I icons\bgraspeedbutton_icon.lrs}
-  RegisterComponents('BGRA Controls', [TBGRASpeedButton]);
+  RegisterComponents('BGRA Button Controls', [TBGRASpeedButton]);
 end;
 {$ENDIF}
 
@@ -102,19 +102,21 @@ begin
   {Result := inherited DrawGlyph(ACanvas, AClient, AOffset, AState,
     ATransparent, BiDiFlags); }
 
-  if Glyph = nil then
-    Exit;
+  if not Assigned(Glyph) then
+    begin
+      Result := Rect(0,0,0,0);
+      Exit;
+    end;
   { It's not good solution assigning glyph on each draw call but FGlyph and SetGlyph is
     in private section }
   FBGRA.Assign(Glyph);
 
-  if Assigned(Glyph) then
-  begin
-    if (AState = bsDown) or (Down = True) then
-      FBGRA.Draw(ACanvas, AOffset.x + 1, AOffset.y + 1, False)
-    else
-      FBGRA.Draw(ACanvas, AOffset.x, AOffset.y, False);
-  end;
+  if (AState = bsDown) or (Down = True) then
+    FBGRA.Draw(ACanvas, AOffset.x + 1, AOffset.y + 1, False)
+  else
+    FBGRA.Draw(ACanvas, AOffset.x, AOffset.y, False);
+
+  Result := AClient;
 end;
 
 constructor TBGRASpeedButton.Create(AOwner: TComponent);

bgraspriteanimation.pas

@@ -663,6 +663,7 @@ end;
 
 destructor TBGRASpriteAnimation.Destroy;
 begin
+  FAnimTimer.Enabled := False;
   FAnimTimer.OnTimer := nil;
   FAnimTimer.Free;
   FSprite.Free;

colorspeedbutton.pas

@@ -43,7 +43,9 @@ type
 
   TColorSpeedButton = class(TBGRASpeedButton)
   private
+    {$ifdef overridepaint}
     FLastDrawDetails: TThemedElementDetails;
+    {$endif}
     FPopupMode: boolean;
     FPressed: boolean;
     FStateActive: TColorState;
@@ -93,7 +95,7 @@ implementation
 {$IFDEF FPC}
 procedure Register;
 begin
-  RegisterComponents('BGRA Controls', [TColorSpeedButton]);
+  RegisterComponents('BGRA Button Controls', [TColorSpeedButton]);
 end;
 {$ENDIF}
 
@@ -528,7 +530,7 @@ begin
   FStateActive.Color := RGBToColor(204, 228, 247);
   FStateActive.BorderColor := RGBToColor(0, 84, 153);
   FStateDisabled.Color := RGBToColor(204, 204, 204);
-  FStateDisabled.Color := RGBToColor(191, 191, 191);
+  FStateDisabled.BorderColor := RGBToColor(191, 191, 191);
   Font.Color := clBlack;
   FTextAutoSize := True;
 end;

update_bgracontrols_force.json

@@ -6,9 +6,9 @@
   "UpdatePackageFiles" : [
     {
       "ForceNotify" : true,
-      "InternalVersion" : 16,
+      "InternalVersion" : 19,
       "Name" : "bgracontrols.lpk",
-      "Version" : "5.0.1.0"
+      "Version" : "6.0.0.0"
     },
     {
       "ForceNotify" : false,