Bug 1555: Wrong position of an icon on Login button, when Login dialog monitor DPI does not match system DPI

https://winscp.net/tracker/1555
(cherry picked from commit cd2cc8b9030386c27c8ca2848a5be51eb89b8ad5)

Source commit: 578124dd1d3838989c350ad738553fef3f36b237

source/forms/Login.cpp

@@ -1569,6 +1569,7 @@ void __fastcall TLoginDialog::CMDpiChanged(TMessage & Message)
 {
   TForm::Dispatch(&Message);
   GenerateButtonImages();
+  CenterButtonImage(LoginButton);
 }
 //---------------------------------------------------------------------------
 void __fastcall TLoginDialog::Dispatch(void * Message)

source/windows/WinInterface.cpp

@@ -1277,8 +1277,9 @@ void __fastcall CenterButtonImage(TButton * Button)
 
     std::unique_ptr<TControlCanvas> Canvas(new TControlCanvas());
     Canvas->Control = Button;
+    Canvas->Font = Button->Font;
 
-    UnicodeString Caption = Button->Caption;
+    UnicodeString Caption = Button->Caption.Trim();
     UnicodeString Padding;
     while (Canvas->TextWidth(Padding) < ImageWidth)
     {