Use a panel in the window to make Windows look better. Some tweaks to visibility.

3 files changed, 14 insertions, 6 deletions

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index d42ec62cf..e5b850619 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -198,12 +198,17 @@ public:
 		Connect (ID_jobs_make_dcp_from_existing_transcode, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp_from_existing_transcode));
 		Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
 
-		film_editor = new FilmEditor (film, this);
-		film_viewer = new FilmViewer (film, this);
+		wxPanel* panel = new wxPanel (this);
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		s->Add (panel, 1, wxEXPAND);
+		SetSizer (s);
+
+		film_editor = new FilmEditor (film, panel);
+		film_viewer = new FilmViewer (film, panel);
 #ifndef DVDOMATIC_DISABLE_PLAYER
-		film_player = new FilmPlayer (film, this);
+		film_player = new FilmPlayer (film, panel);
 #endif
-		JobManagerView* job_manager_view = new JobManagerView (this);
+		JobManagerView* job_manager_view = new JobManagerView (panel);
 
 		wxSizer* rhs_sizer = new wxBoxSizer (wxVERTICAL);
 		rhs_sizer->Add (film_viewer, 3, wxEXPAND | wxALL);
@@ -212,7 +217,7 @@ public:
 		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
 		main_sizer->Add (film_editor, 0, wxALL, 6);
 		main_sizer->Add (rhs_sizer, 1, wxEXPAND | wxALL, 6);
-		SetSizer (main_sizer);
+		panel->SetSizer (main_sizer);
 
 		set_menu_sensitivity ();
 
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 3b2571238..28c28c013 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -66,8 +66,9 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	_dcp_content_type = new wxComboBox (this, wxID_ANY);
 	sizer->Add (_dcp_content_type);
 
-	add_label_to_sizer (sizer, this, "Frames Per Second");
+	video_control (add_label_to_sizer (sizer, this, "Frames Per Second"));
 	_frames_per_second = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
+	video_control (_frames_per_second);
 	sizer->Add (video_control (_frames_per_second));
 
 	add_label_to_sizer (sizer, this, "Format");
@@ -150,6 +151,7 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	}
 
 	_dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B"));
+	video_control (_dcp_ab);
 	sizer->Add (_dcp_ab, 1);
 	sizer->AddSpacer (0);
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index ee5c470f6..845e3d57e 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -227,6 +227,7 @@ FilmViewer::set_film (Film* f)
 	_film->Changed.connect (sigc::mem_fun (*this, &FilmViewer::film_changed));
 	film_changed (Film::THUMBS);
 	reload_current_thumbnail ();
+	setup_visibility ();
 }
 
 void