X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=7d854224d232a0b939758cd4094e3951d0604a65;hp=318a344f2a415216bfbb91a24f9d9f94e7818121;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=d9c2cf78e6c5e465e7f76020f78f7ed1e71c3bc0

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 318a344f2..7d854224d 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -61,6 +61,26 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+using namespace dcpomatic;
+
+class LimitedSplitter : public wxSplitterWindow
+{
+public:
+	LimitedSplitter (wxWindow* parent)
+		: wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
+	{
+		/* This value doesn't really mean much but we just want to stop double-click on the
+		   divider from shrinking the bottom panel (#1601).
+		*/
+		SetMinimumPaneSize (64);
+	}
+
+	bool OnSashPositionChange (int new_position)
+	{
+		/* Try to stop the top bit of the splitter getting so small that buttons disappear */
+		return new_position > 220;
+	}
+};
 
 ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmViewer> viewer)
 	: _video_panel (0)
@@ -72,12 +92,18 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 	, _film_viewer (viewer)
 	, _generally_sensitive (true)
 	, _ignore_deselect (false)
+	, _no_check_selection (false)
 {
 	for (int i = 0; i < TEXT_COUNT; ++i) {
 		_text_panel[i] = 0;
 	}
 
-	_splitter = new wxSplitterWindow (n);
+	_splitter = new LimitedSplitter (n);
+	optional<wxRect> screen;
+	int const sn = wxDisplay::GetFromWindow(_splitter);
+	if (sn >= 0) {
+		screen = wxDisplay(sn).GetClientArea();
+	}
 	wxPanel* top = new wxPanel (_splitter);
 
 	_menu = new ContentMenu (_splitter);
@@ -132,9 +158,9 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr<Film> film, weak_ptr<FilmV
 	/* This is a hack to try and make the content notebook a sensible size; large on big displays but small
 	   enough on small displays to leave space for the content area.
 	*/
-	wxDisplay display (wxDisplay::GetFromWindow(_splitter));
-	wxRect screen = display.GetClientArea();
-	_splitter->SplitHorizontally (top, _notebook, screen.height > 800 ? -600 : -150);
+	if (screen) {
+		_splitter->SplitHorizontally (top, _notebook, screen->height > 800 ? -600 : -150);
+	}
 
 	_timing_panel = new TimingPanel (this, _film_viewer);
 	_notebook->AddPage (_timing_panel, _("Timing"), false);
@@ -274,15 +300,10 @@ ContentPanel::item_selected ()
 void
 ContentPanel::check_selection ()
 {
-	if (_last_selected == selected()) {
-		/* This was triggered by a re-build of the view but the selection
-		   did not really change.
-		*/
+	if (_no_check_selection) {
 		return;
 	}
 
-	_last_selected = selected ();
-
 	setup_sensitivity ();
 
 	BOOST_FOREACH (ContentSubPanel* i, panels()) {
@@ -536,7 +557,7 @@ ContentPanel::timeline_clicked ()
 		_timeline_dialog = 0;
 	}
 
-	_timeline_dialog = new TimelineDialog (this, _film);
+	_timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
 	_timeline_dialog->set_selection (selected());
 	_timeline_dialog->Show ();
 }
@@ -589,7 +610,11 @@ ContentPanel::set_film (shared_ptr<Film> film)
 
 	film_changed (Film::CONTENT);
 	film_changed (Film::AUDIO_CHANNELS);
-	check_selection ();
+
+	if (_film) {
+		check_selection ();
+	}
+
 	setup_sensitivity ();
 }
 
@@ -636,6 +661,8 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 void
 ContentPanel::set_selection (ContentList cl)
 {
+	_no_check_selection = true;
+
 	ContentList content = _film->content ();
 	for (size_t i = 0; i < content.size(); ++i) {
 		if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
@@ -644,6 +671,9 @@ ContentPanel::set_selection (ContentList cl)
 			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
 		}
 	}
+
+	_no_check_selection = false;
+	check_selection ();
 }
 
 void
@@ -691,11 +721,6 @@ ContentPanel::setup ()
 		int const t = _content->GetItemCount ();
 		bool const valid = i->paths_valid ();
 
-		/* Temporary debugging for Igor */
-		BOOST_FOREACH (boost::filesystem::path j, i->paths()) {
-			LOG_GENERAL ("Check %1 %2 answer %3", j.string(), boost::filesystem::exists(j) ? "yes" : "no", valid ? "yes" : "no");
-		}
-
 		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (i);
 		bool const needs_kdm = dcp && dcp->needs_kdm ();
 		bool const needs_assets = dcp && dcp->needs_assets ();