tjh.dev
1diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/gui_generated.cpp
2index a40eea3..23ec896 100644
3--- a/FreeFileSync/Source/ui/gui_generated.cpp
4+++ b/FreeFileSync/Source/ui/gui_generated.cpp
5@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
6 wxBoxSizer* bSizer183;
7 bSizer183 = new wxBoxSizer( wxHORIZONTAL );
8
9- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
10- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
11
12 wxPanel* m_panel39;
13 m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
14@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
15 m_staticTextDonate->Wrap( -1 );
16 m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
17
18- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
19
20
21 m_panel39->SetSizer( bSizer184 );
22 m_panel39->Layout();
23 bSizer184->Fit( m_panel39 );
24- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
25
26
27 m_panelDonate->SetSizer( bSizer183 );
28diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
29index 933fe81..734201f 100644
30--- a/FreeFileSync/Source/ui/small_dlgs.cpp
31+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
32@@ -137,9 +137,6 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
33
34 wxImage::AddHandler(new wxJPEGHandler /*ownership passed*/); //activate support for .jpg files
35
36- wxImage animalImg(utfTo<wxString>(appendPath(getResourceDirPath(), Zstr("Animal.dat"))), wxBITMAP_TYPE_JPEG);
37- convertToVanillaImage(animalImg);
38- assert(animalImg.IsOk());
39
40 //--------------------------------------------------------------------------
41 //have animal + text match *final* dialog width
42@@ -150,13 +147,11 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
43 #endif
44
45 {
46- const int imageWidth = (m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 /* grey border*/) / 2;
47- const int textWidth = m_panelDonate->GetSize().GetWidth() - 5 - 5 - 5 - imageWidth;
48+ const int textWidth = m_panelDonate->GetSize().GetWidth();
49
50- setImage(*m_bitmapAnimalSmall, shrinkImage(animalImg, wxsizeToScreen(imageWidth), -1 /*maxHeight*/));
51
52 m_staticTextDonate->Show();
53- m_staticTextDonate->Wrap(textWidth - 10 /*left gap*/); //wrap *after* changing font size
54+ m_staticTextDonate->Wrap(textWidth - 20); //wrap *after* changing font size
55 }
56 //--------------------------------------------------------------------------
57