Fix display of sync destination if it is a longer hostname

vslavik · Dec 11, 2023 · c7f1f6d · c7f1f6d
1 parent a83de5e
commit c7f1f6d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/cloud_sync.h b/src/cloud_sync.h
@@ -57,7 +57,7 @@ class CloudSyncDestination
 public:
     virtual ~CloudSyncDestination() {}
 
-    /// Name of the destination (e.g. Crowding or hostname)
+    /// Name of the destination (e.g. Crowdin or hostname)
     virtual wxString GetName() const = 0;
 
     /// Asynchronously uploads the file. Returned future throws on error.
@@ -102,7 +102,7 @@ class CloudSyncProgressWindow : public wxDialog
         sizer->SetMinSize(PX(300), -1);
         Activity = new ActivityIndicator(this);
         sizer->AddStretchSpacer();
-        sizer->Add(Activity, wxSizerFlags().Expand().Border(wxALL, PX(25)));
+        sizer->Add(Activity, wxSizerFlags().Expand().Border(wxALL, PX(40)));
         sizer->AddStretchSpacer();
         SetSizerAndFit(sizer);
         CenterOnParent();
@@ -112,7 +112,15 @@ class CloudSyncProgressWindow : public wxDialog
         : CloudSyncProgressWindow(parent)
     {
         // TRANSLATORS: %s is a cloud destination, e.g. "Crowdin" or ftp.wordpress.com etc.
-        Activity->Start(wxString::Format(_(L"Uploading translations to %s…"), dest->GetName()));
+        auto label = wxString::Format(_(L"Uploading translations to %s…"), dest->GetName());
+
+        auto sz = Activity->GetTextExtent(label);
+        Activity->SetSize(wxSize(std::max(PX(300), PX(100) + sz.x), -1));
+
+        Activity->Start(label);
+
+        GetSizer()->SetSizeHints(this);
+        CenterOnParent();
     }
 
     ActivityIndicator *Activity;

diff --git a/src/customcontrols.cpp b/src/customcontrols.cpp
@@ -376,6 +376,7 @@ ActivityIndicator::ActivityIndicator(wxWindow *parent, int flags)
     m_spinner->SetWindowVariant(wxWINDOW_VARIANT_SMALL);
     m_label = new wxStaticText(this, wxID_ANY, "");
 #ifdef __WXOSX__
+    SetWindowVariant(wxWINDOW_VARIANT_SMALL);
     m_label->SetWindowVariant(wxWINDOW_VARIANT_SMALL);
 #endif