Autosizing "View Statistics" button for longer translations (asked for by Italian translator)

Source commit: 9041efa40da547efa1118169119ccf9b0693c754

source/forms/Preferences.cpp

@@ -127,6 +127,8 @@ __fastcall TPreferencesDialog::TPreferencesDialog(
   LinkLabel(UpdatesLink);
   LinkAppLabel(BackgroundConfirmationsLink);
 
+  AutoSizeButton(UsageViewButton);
+
   AutomaticIniFileStorageLabel->Caption = ExpandEnvironmentVariables(Configuration->GetAutomaticIniFileStorageName(false));
 
   if (IsUWP())

source/windows/VCLCommon.cpp

@@ -460,6 +460,7 @@ class TPublicControl : public TControl
 {
 friend void __fastcall RealignControl(TControl * Control);
 friend void __fastcall DoFormWindowProc(TCustomForm * Form, TWndMethod WndProc, TMessage & Message);
+friend TCanvas * CreateControlCanvas(TControl * Control);
 };
 //---------------------------------------------------------------------
 class TPublicForm : public TForm
@@ -1812,14 +1813,11 @@ void __fastcall InvokeHelp(TWinControl * Control)
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 static void __fastcall FocusableLabelCanvas(TStaticText * StaticText,
-  TControlCanvas ** ACanvas, TRect & R)
+  TCanvas ** ACanvas, TRect & R)
 {
-  TControlCanvas * Canvas = new TControlCanvas();
+  TCanvas * Canvas = CreateControlCanvas(StaticText);
   try
   {
-    Canvas->Control = StaticText;
-    Canvas->Font = StaticText->Font;
-
     R = StaticText->ClientRect;
 
     TSize TextSize;
@@ -1944,7 +1942,7 @@ static void __fastcall FocusableLabelWindowProc(void * Data, TMessage & Message,
   if (Message.Msg == WM_PAINT)
   {
     TRect R;
-    TControlCanvas * Canvas;
+    TCanvas * Canvas;
     FocusableLabelCanvas(StaticText, &Canvas, R);
     try
     {
@@ -2823,3 +2821,26 @@ bool IsCancelButtonBeingClicked(TControl * Control)
   // Find dialog has no Cancel button
   return (CancelButton != NULL) && IsButtonBeingClicked(CancelButton);
 }
+//---------------------------------------------------------------------------
+TCanvas * CreateControlCanvas(TControl * Control)
+{
+  std::unique_ptr<TControlCanvas> Canvas(new TControlCanvas());
+  Canvas->Control = Control;
+  TPublicControl * PublicControl = static_cast<TPublicControl *>(Control);
+  Canvas->Font = PublicControl->Font;
+  return Canvas.release();
+}
+//---------------------------------------------------------------------------
+void AutoSizeButton(TButton * Button)
+{
+  std::unique_ptr<TCanvas> Canvas(CreateControlCanvas(Button));
+  int MinWidth = Canvas->TextWidth(Button->Caption) + ScaleByTextHeight(Button, (2 * 8));
+  if (Button->Width < MinWidth)
+  {
+    if (Button->Anchors.Contains(akRight))
+    {
+      Button->Left = Button->Left - (MinWidth - Button->Width);
+    }
+    Button->Width = MinWidth;
+  }
+}

source/windows/VCLCommon.h

@@ -87,5 +87,7 @@ void __fastcall RecordFormImplicitRescale(TForm * Form);
 void __fastcall CountClicksForWindowPrint(TForm * Form);
 bool IsButtonBeingClicked(TButtonControl * Button);
 bool IsCancelButtonBeingClicked(TControl * Control);
+TCanvas * CreateControlCanvas(TControl * Control);
+void AutoSizeButton(TButton * Button);
 //---------------------------------------------------------------------------
 #endif  // VCLCommonH

source/windows/WinInterface.cpp

@@ -1296,9 +1296,7 @@ void __fastcall CenterButtonImage(TButton * Button)
     Button->ImageAlignment = iaCenter;
     int ImageWidth = Button->Images->Width;
 
-    std::unique_ptr<TControlCanvas> Canvas(new TControlCanvas());
-    Canvas->Control = Button;
-    Canvas->Font = Button->Font;
+    std::unique_ptr<TCanvas> Canvas(CreateControlCanvas(Button));
 
     UnicodeString Caption = Button->Caption.Trim();
     UnicodeString Padding;