X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=f51d5ed48da7cd955b9afe8470305be26ab7d7b8;hp=69dd724266abfc35a780f141833587c2853bd13a;hb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;hpb=59953282b9f9da1164f39181347a01672c4f674c

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 69dd72426..f51d5ed48 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -483,7 +483,7 @@ ContentPanel::add_folder_clicked ()
 		return;
 	}
 
-	list<shared_ptr<Content> > content;
+	vector<shared_ptr<Content>> content;
 
 	try {
 		content = content_factory (path);
@@ -550,7 +550,7 @@ bool
 ContentPanel::remove_clicked (bool hotkey)
 {
 	/* If the method was called because Delete was pressed check that our notebook page
-	   is visible and that the content list is focussed.
+	   is visible and that the content list is focused.
 	*/
 	if (hotkey && (_parent->GetCurrentPage() != _splitter || !_content->HasFocus())) {
 		return true;
@@ -677,11 +677,7 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 {
 	auto content = _film->content ();
 	for (size_t i = 0; i < content.size(); ++i) {
-		if (content[i] == wc.lock ()) {
-			_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-		} else {
-			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
-		}
+		set_selected_state(i, content[i] == wc.lock());
 	}
 }
 
@@ -693,11 +689,7 @@ ContentPanel::set_selection (ContentList cl)
 
 	auto content = _film->content ();
 	for (size_t i = 0; i < content.size(); ++i) {
-		if (find(cl.begin(), cl.end(), content[i]) != cl.end()) {
-			_content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-		} else {
-			_content->SetItemState (i, 0, wxLIST_STATE_SELECTED);
-		}
+		set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end());
 	}
 
 	_no_check_selection = false;
@@ -783,7 +775,7 @@ ContentPanel::setup ()
 		_content->InsertItem (item);
 
 		if (i.get() == selected_content) {
-			_content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+			set_selected_state(t, true);
 		}
 
 		if (!valid || needs_kdm || needs_assets) {
@@ -793,7 +785,7 @@ ContentPanel::setup ()
 
 	if (!selected_content && !content.empty ()) {
 		/* Select the item of content if none was selected before */
-		_content->SetItemState (0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+		set_selected_state(0, true);
 	}
 
 	setup_sensitivity ();
@@ -861,6 +853,14 @@ ContentPanel::panels () const
 }
 
 
+void
+ContentPanel::set_selected_state(int item, bool state)
+{
+	_content->SetItemState(item, state ? wxLIST_STATE_SELECTED : 0, wxLIST_STATE_SELECTED);
+	_content->SetItemState(item, state ? wxLIST_STATE_FOCUSED : 0, wxLIST_STATE_FOCUSED);
+}
+
+
 LimitedSplitter::LimitedSplitter (wxWindow* parent)
 	: wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
 	, _first_shown (false)