From 89cd28f73417782462bc23425de65eb087b5967b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 15 Oct 2013 16:41:04 +0100
Subject: [PATCH] Improve layout of properties window.

---
 src/wx/properties_dialog.cc | 24 ++++++++++++++++--------
 src/wx/properties_dialog.h  |  2 ++
 src/wx/wx_util.cc           |  1 +
 src/wx/wx_util.h            |  4 ++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a1ba81b3b..f3f841a43 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -36,19 +36,20 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 	, _film (film)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	add_label_to_sizer (table, this, _("Frames"), true);
+	add_label_to_sizer (_table, this, _("Frames"), true);
 	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	_table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Disk space required"), true);
+	add_label_to_sizer (_table, this, _("Disk space required"), true);
 	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
+	_table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Frames already encoded"), true);
+	add_label_to_sizer (_table, this, _("Frames already encoded"), true);
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
-	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
+	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+	_table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
 	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length()))));
 	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
@@ -57,7 +58,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	_disk->SetLabel (std_to_wx (s.str ()));
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
+	overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -68,6 +69,13 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	overall_sizer->SetSizeHints (this);
 }
 
+void
+PropertiesDialog::layout ()
+{
+	_table->Layout ();
+	Fit ();
+}
+
 string
 PropertiesDialog::frames_already_encoded () const
 {
diff --git a/src/wx/properties_dialog.h b/src/wx/properties_dialog.h
index cae929e18..03e0f01aa 100644
--- a/src/wx/properties_dialog.h
+++ b/src/wx/properties_dialog.h
@@ -29,8 +29,10 @@ public:
 
 private:
 	std::string frames_already_encoded () const;
+	void layout ();
 
 	boost::shared_ptr<Film> _film;
+	wxFlexGridSizer* _table;
 	wxStaticText* _frames;
 	wxStaticText* _disk;
 	ThreadedStaticText* _encoded;
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 20fd2df75..515550e59 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -151,6 +151,7 @@ void
 ThreadedStaticText::thread_finished (wxCommandEvent& ev)
 {
 	SetLabel (ev.GetString ());
+	Finished ();
 }
 
 string
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index d942d8fa8..aefa75fca 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -24,6 +24,7 @@
 #include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
+#include <boost/signals2.hpp>
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #endif
@@ -59,6 +60,9 @@ public:
 	ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn);
 	~ThreadedStaticText ();
 
+	/** Emitted in the UI thread when the text has been set up */
+	boost::signals2::signal<void()> Finished;
+
 private:
 	void run (boost::function<std::string ()> fn);
 	void thread_finished (wxCommandEvent& ev);
-- 
2.30.2