X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=7d854224d232a0b939758cd4094e3951d0604a65;hb=dde431cafbb20ed3356ad5592be56af1d4458f46;hp=e6d4dbbb3d76e8e2e0cd29cd916b8e61345dca44;hpb=4fa689435abb7f0c2bd07854e0817b6b040d40c7;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index e6d4dbbb3..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 ();
 }
@@ -640,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()) {
@@ -648,6 +671,9 @@ ContentPanel::set_selection (ContentList cl)
 			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
 		}
 	}
+
+	_no_check_selection = false;
+	check_selection ();
 }
 
 void