From ab3fb6e14956bcca33c39c9d670d72ed1b358e78 Mon Sep 17 00:00:00 2001
From: SerhiiGadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com>
Date: Fri, 5 Feb 2021 13:39:19 +0300
Subject: [PATCH] SYNERGY-719 Text on welcome screen on macOS is shown without
 spaces (#6934)

* SYNERGY-719 Fix for spaces for "," and language switch

* Update ChangeLog
---
 ChangeLog                   | 2 +-
 src/gui/src/SetupWizard.cpp | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af776ff55..f0f200e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ Bug fixes:
 - #6903 Save global settings
 - #6889 Systray Icon on Ubuntu Auto Start (take 2)
 - #6907 Saving configuration on apply
-- #6914 Fix for Qt Word Wrap on Mac
+- #6934 Text on welcome screen on macOS is shown without spaces
 - #6920 Windows Installer checksums
 - #6921 Handling pre-main window creation status notifications
 - #6922 macOS CI build
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index ba761ae94..4b9f4eca7 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -95,6 +95,9 @@ void SetupWizard::changeEvent(QEvent* event)
                 m_pComboLanguage->blockSignals(true);
                 retranslateUi(this);
                 m_pComboLanguage->blockSignals(false);
+                #if defined(Q_OS_MAC)
+                  duplicateSpaces();
+                #endif // defined(Q_OS_MAC)
                 break;
             }
 
@@ -149,9 +152,6 @@ void SetupWizard::on_m_pComboLanguage_currentIndexChanged(int index)
 {
     QString ietfCode = m_pComboLanguage->itemData(index).toString();
     QSynergyApplication::getInstance()->switchTranslator(ietfCode);
-#if defined(Q_OS_MAC)
-    duplicateSpaces();
-#endif // defined(Q_OS_MAC)
 }
 
 #if defined(Q_OS_MAC)
@@ -160,7 +160,8 @@ void SetupWizard::duplicateSpaces()
     auto list = this->findChildren<QLabel *>();
     foreach(QLabel *l, list) {
         if (l->wordWrap()) {
-            l->setText(l->text().replace(". ", ".  "));
+           l->setText(l->text().replace(". ", ".  "));
+           l->setText(l->text().replace(", ", ",  "));
         }
     }
 }