AutoSize

bgrasvgtheme.pas

@@ -77,6 +77,8 @@ type
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   public
+    function PreferredButtonHeight(const hasGlyph: boolean): Integer; override;
+    function PreferredButtonWidth(const hasGlyph: boolean): Integer; override;
     procedure DrawButton(Caption: string; State: TBGRAThemeButtonState;
       Focused: boolean; ARect: TRect; ASurface: TBGRAThemeSurface; AImageIndex: Integer = -1; AImageList: TBGRASVGImageList = nil); override;
     procedure DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
@@ -618,6 +620,20 @@ begin
   inherited Destroy;
 end;
 
+function TBGRASVGTheme.PreferredButtonHeight(const hasGlyph: boolean): Integer;
+begin
+  Result := (FButtonTextSpacing * 2);
+  if (hasGlyph) then
+    Result := Result + FGlyphTextSpacing;
+end;
+
+function TBGRASVGTheme.PreferredButtonWidth(const hasGlyph: boolean): Integer;
+begin
+  Result := (FButtonTextSpacing * 2);
+  if (hasGlyph) then
+    Result := Result + FGlyphTextSpacing;
+end;
+
 procedure TBGRASVGTheme.DrawButton(Caption: string;
   State: TBGRAThemeButtonState; Focused: boolean; ARect: TRect;
   ASurface: TBGRAThemeSurface; AImageIndex: Integer;

bgratheme.pas

@@ -72,6 +72,9 @@ type
     destructor Destroy; override;
     procedure InvalidateThemedControls;
 
+    function PreferredButtonWidth(const hasGlyph: boolean): Integer; virtual;
+    function PreferredButtonHeight(const hasGlyph: boolean): Integer; virtual;
+
     procedure DrawButton(Caption: string; State: TBGRAThemeButtonState;
       Focused: boolean; ARect: TRect; ASurface: TBGRAThemeSurface; AImageIndex: Integer = -1; AImageList: TBGRASVGImageList = nil); virtual;
     procedure DrawRadioButton(Caption: string; State: TBGRAThemeButtonState;
@@ -248,6 +251,16 @@ begin
     ThemedControl[i].Invalidate;
 end;
 
+function TBGRATheme.PreferredButtonWidth(const hasGlyph: boolean): Integer;
+begin
+
+end;
+
+function TBGRATheme.PreferredButtonHeight(const hasGlyph: boolean): Integer;
+begin
+
+end;
+
 procedure TBGRATheme.DrawButton(Caption: string; State: TBGRAThemeButtonState;
   Focused: boolean; ARect: TRect; ASurface: TBGRAThemeSurface;
   AImageIndex: Integer; AImageList: TBGRASVGImageList);

bgrathemebutton.pas

@@ -25,6 +25,8 @@ type
     procedure SetState(AValue: TBGRAThemeButtonState);
     procedure TimerHoverElapse(Sender: TObject);
   protected
+    procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer;
+      WithThemeSpace: Boolean); override;
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     class function GetControlClassDefaultSize: TSize; override;
     procedure MouseEnter; override;
@@ -102,6 +104,19 @@ begin
   UpdateHoverState;
 end;
 
+procedure TBGRAThemeButton.CalculatePreferredSize(var PreferredWidth,
+  PreferredHeight: integer; WithThemeSpace: Boolean);
+begin
+  inherited CalculatePreferredSize(PreferredWidth, PreferredHeight,
+    WithThemeSpace);
+
+  if AutoSize then
+  begin
+    PreferredWidth := Canvas.TextWidth(Caption) + Theme.PreferredButtonWidth(Assigned(FImageList));
+    PreferredHeight := Canvas.TextHeight(Caption) + Theme.PreferredButtonHeight(Assigned(FImageList));
+  end;
+end;
+
 procedure TBGRAThemeButton.Notification(AComponent: TComponent;
   Operation: TOperation);
 begin