From cdb68aaa006afc536cbf90c0a4b7a65c349c2b6a Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Mon, 9 Apr 2018 19:20:31 +0300
Subject: [PATCH] [Manager] Fix fields populating on 'Add Project' wizard on
 launch

When opening 'Add Project' wizard it shows next fields empty:
Research area, Organisation, and Web site.
This happens because of EllipseStringIfNeeded() function that truncates the string to 0 symbols because the wizard window was not constructed yet and has undefined size.

This fixes #2444.

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
---
 clientgui/ProjectInfoPage.cpp | 10 ++++++++--
 clientgui/ProjectInfoPage.h   |  2 ++
 clientgui/wizardex.cpp        | 19 ++++++++++++++++++-
 clientgui/wizardex.h          |  6 ++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp
index 08c534db36..86bf9f5594 100644
--- a/clientgui/ProjectInfoPage.cpp
+++ b/clientgui/ProjectInfoPage.cpp
@@ -561,7 +561,7 @@ void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) {
         m_pProjectDetailsOrganizationCtrl->SetLabel(strOrganization);
         m_pProjectDetailsOrganizationCtrl->SetToolTip(pProjectInfo->m_strOrganization);
 
-    }
+     }
 
     wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectSelected - Function End"));
 }
@@ -794,7 +794,7 @@ void CProjectInfoPage::EllipseStringIfNeeded(wxString& s, wxWindow *win) {
     wxSize sz = win->GetParent()->GetSize();
     win->GetPosition(&x, &y);
     int maxWidth = sz.GetWidth() - x - 10;
-    
+
     win->GetTextExtent(s, &w, &h);
     
     // Adapted from ellipis code in wxRendererGeneric::DrawHeaderButtonContents()
@@ -814,3 +814,9 @@ void CProjectInfoPage::EllipseStringIfNeeded(wxString& s, wxWindow *win) {
         }
     }
 }
+
+void CProjectInfoPage::RefreshPage() {
+    // Trigger initial event to populate the list control
+    wxCommandEvent evtEvent(wxEVT_COMMAND_COMBOBOX_SELECTED, ID_CATEGORIES);
+    ProcessEvent(evtEvent);
+}
diff --git a/clientgui/ProjectInfoPage.h b/clientgui/ProjectInfoPage.h
index dcaa71b703..68022083a1 100644
--- a/clientgui/ProjectInfoPage.h
+++ b/clientgui/ProjectInfoPage.h
@@ -89,6 +89,8 @@ public:
 
     void EllipseStringIfNeeded(wxString& s, wxWindow *win);
 
+    void RefreshPage();
+
 ////@begin CProjectInfoPage member variables
     wxStaticText* m_pTitleStaticCtrl;
     wxStaticText* m_pDescriptionStaticCtrl;
diff --git a/clientgui/wizardex.cpp b/clientgui/wizardex.cpp
index 61a450640c..fbc073a43a 100644
--- a/clientgui/wizardex.cpp
+++ b/clientgui/wizardex.cpp
@@ -120,7 +120,7 @@ wxSize wxWizardExSizer::GetMaxChildSize()
     }
 
 #ifdef __WXDEBUG__
-    if ( m_childSize.IsFullySpecified() && m_childSize != maxOfMin )
+    if ( !m_owner->m_pageRefreshed && m_childSize.IsFullySpecified() && m_childSize != maxOfMin )
     {
         wxFAIL_MSG( _T("Size changed in wxWizard::GetPageAreaSizer()")
                     _T("after RunWizard().\n")
@@ -136,6 +136,8 @@ wxSize wxWizardExSizer::GetMaxChildSize()
         m_childSize = maxOfMin;
     }
 
+    m_owner->m_pageRefreshed = false;
+
     return maxOfMin;
 }
 
@@ -212,6 +214,10 @@ bool wxWizardPageEx::Create(
     return true;
 }
 
+void wxWizardPageEx::RefreshPage()
+{
+}
+
 // ----------------------------------------------------------------------------
 // event tables and such
 // ----------------------------------------------------------------------------
@@ -229,6 +235,8 @@ BEGIN_EVENT_TABLE(wxWizardEx, wxDialog)
     EVT_BUTTON(wxID_FORWARD, wxWizardEx::OnBackOrNext)
     EVT_BUTTON(wxID_HELP, wxWizardEx::OnHelp)
 
+    EVT_SHOW(wxWizardEx::OnShowEvent)
+
     EVT_WIZARDEX_PAGE_CHANGED(wxID_ANY, wxWizardEx::OnWizEvent)
     EVT_WIZARDEX_PAGE_CHANGING(wxID_ANY, wxWizardEx::OnWizEvent)
     EVT_WIZARDEX_CANCEL(wxID_ANY, wxWizardEx::OnWizEvent)
@@ -265,6 +273,7 @@ bool wxWizardEx::Create(wxWindow *parent,
     bool result = wxDialog::Create(parent,id,title,pos,wxDefaultSize,style);
 
     m_posWizard = pos;
+    m_pageRefreshed = false;
 
     DoCreateControls();
 
@@ -745,6 +754,14 @@ void wxWizardEx::OnWizEvent(wxWizardExEvent& event)
     }
 }
 
+void wxWizardEx::OnShowEvent(wxShowEvent& event)
+{
+    if (event.IsShown() && m_page != NULL) {
+        m_pageRefreshed = true;
+        m_page->RefreshPage();
+    }
+}
+
 // ----------------------------------------------------------------------------
 // wxWizardExEvent
 // ----------------------------------------------------------------------------
diff --git a/clientgui/wizardex.h b/clientgui/wizardex.h
index cdf1dd1b43..198ef19ee9 100644
--- a/clientgui/wizardex.h
+++ b/clientgui/wizardex.h
@@ -60,6 +60,8 @@ public:
     virtual wxWizardPageEx *GetPrev() const = 0;
     virtual wxWizardPageEx *GetNext() const = 0;
 
+    virtual void RefreshPage();
+
 #if wxUSE_VALIDATORS
     /// Override the base functions to allow a validator to be assigned to this page.
     bool TransferDataToWindow()
@@ -217,6 +219,8 @@ private:
 
     void OnWizEvent(wxWizardExEvent& event);
 
+    void OnShowEvent(wxShowEvent& event);
+
     void AddBitmapRow(wxBoxSizer *mainColumn);
     void AddStaticLine(wxBoxSizer *mainColumn);
     void AddBackNextPair(wxBoxSizer *buttonRow);
@@ -231,6 +235,8 @@ private:
     // wizard state
     wxWizardPageEx *m_page;       // the current page or NULL
 
+    bool m_pageRefreshed;
+
     // wizard controls
 protected:
     wxButton    *m_btnPrev,     // the "<Back" button