PointFileChooser layout and behaviour tweaks

Fit() the dialog to avoid wasted space. Return without showing the point trace if the Cancel button is clicked.
codereader · May 25, 2021 · 5fbe4ee · 5fbe4ee
1 parent 01cd735
commit 5fbe4ee
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/radiant/ui/PointFileChooser.cpp b/radiant/ui/PointFileChooser.cpp
@@ -28,7 +28,9 @@ PointFileChooser::PointFileChooser(const wxArrayString& files)
 
     // Add dialog buttons
     auto btnSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL);
-    GetSizer()->Add(btnSizer, 0, wxALIGN_RIGHT | wxALIGN_BOTTOM, 0);
+    GetSizer()->Add(btnSizer, 0, wxALIGN_RIGHT | wxALIGN_BOTTOM | wxBOTTOM, 12);
+
+    Fit();
 }
 
 void PointFileChooser::chooseAndToggle()
@@ -50,7 +52,11 @@ void PointFileChooser::chooseAndToggle()
 
         // Show dialog with list of pointfiles
         PointFileChooser chooser(filenames);
-        chooser.ShowModal();
+        if (chooser.ShowModal() != wxID_OK)
+        {
+            // Dialog cancelled, don't proceed to showing point trace
+            return;
+        }
     }
 
     // Hand over to the actual pointfile renderer to toggle visibility