X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=f19887e59d1c9498187180840366efd75ae07774;hp=72ef0e9ebde3c3cb81e2808a9ec17325ca50fca7;hb=cd4e040a1828b83809b555a99b529fcb0f395656;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;ds=sidebyside

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 72ef0e9eb..f19887e59 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -69,7 +69,10 @@ 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)
@@ -89,6 +92,7 @@ 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;
@@ -303,6 +307,10 @@ ContentPanel::check_selection ()
 		return;
 	}
 
+	if (_no_check_selection) {
+		return;
+	}
+
 	_last_selected = selected ();
 
 	setup_sensitivity ();
@@ -558,7 +566,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 ();
 }
@@ -662,6 +670,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()) {
@@ -670,6 +680,9 @@ ContentPanel::set_selection (ContentList cl)
 			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
 		}
 	}
+
+	_no_check_selection = false;
+	check_selection ();
 }
 
 void