Merge pull request #2348 from lixun910/v1.20

fix weights creation dialog UI issue on ubuntu
GeoDaCenter · Sep 14, 2021 · 881c33f · 881c33f
2 parents cf7f50f + 016d6fa
commit 881c33f
Show file tree

Hide file tree

Showing 4 changed files with 846 additions and 842 deletions.
diff --git a/DialogTools/CreatingWeightDlg.cpp b/DialogTools/CreatingWeightDlg.cpp
@@ -244,6 +244,7 @@ void CreatingWeightDlg::CreateControls()
     m_dist_choice_vars->Bind(wxEVT_CHOICE, &CreatingWeightDlg::OnDistanceMetricVarsSel, this);
     m_trans_choice_vars->Bind(wxEVT_CHOICE, &CreatingWeightDlg::OnDistanceMetricVarsSel, this);
 	InitDlg();
+    Fit();
 }
 
 void CreatingWeightDlg::OnWeightTypeSelect( wxCommandEvent& event )

diff --git a/DialogTools/CreatingWeightDlg.h b/DialogTools/CreatingWeightDlg.h
@@ -56,15 +56,15 @@ public TableStateObserver, public WeightsManStateObserver
                       wxWindowID id = wxID_ANY,
                       const wxString& caption = _("Weights File Creation"),
                       const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = wxCAPTION|wxDEFAULT_DIALOG_STYLE );
+                      const wxSize& size = wxSize(600,800),
+                      long style = wxCAPTION|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 	virtual ~CreatingWeightDlg();
 	void OnClose(wxCloseEvent& ev);
 	bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,
                 const wxString& caption = _("Weights File Creation"),
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxCAPTION|wxDEFAULT_DIALOG_STYLE );
+                long style = wxCAPTION|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 
 	void CreateControls();
 	void OnCreateNewIdClick( wxCommandEvent& event );