Fix #67: remember the value of FilterCtrls when the control is destroyed, and...

Fix #67: remember the value of FilterCtrls when the control is destroyed, and set it again when the control is recreated

src/gui/set/cards_panel.cpp

@@ -219,7 +219,13 @@ void CardsPanel::initUI(wxToolBar* tb, wxMenuBar* mb) {
 	#endif
 	// Filter/search textbox
 	tb->AddSeparator();
-	if (!filter) filter = new FilterCtrl(tb, ID_CARD_FILTER, _LABEL_("search cards"));
+	assert(!filter);
+	if (!filter) {
+		filter = new FilterCtrl(tb, ID_CARD_FILTER, _LABEL_("search cards"));
+		// the control should show what the list is still filtered by
+		filter->setFilter(filter_value);
+	}
+	wxLogDebug(L"%p -> %p", filter, tb);
 	tb->AddControl(filter);
 	tb->Realize();
 	// Menus
@@ -236,7 +242,11 @@ void CardsPanel::destroyUI(wxToolBar* tb, wxMenuBar* mb) {
 	tb->DeleteTool(ID_CARD_ADD);
 	tb->DeleteTool(ID_CARD_REMOVE);
 	tb->DeleteTool(ID_CARD_ROTATE);
-	tb->DeleteTool(filter->GetId()); filter = nullptr;
+	// remember the value in the filter control, because the card list remains filtered
+	// the control is destroyed by DeleteTool
+	filter_value = filter->getFilterString();
+	tb->DeleteTool(filter->GetId());
+	filter = nullptr;
 	// HACK: hardcoded size of rest of toolbar
 	tb->DeleteToolByPos(12); // delete separator
 	tb->DeleteToolByPos(12); // delete separator

src/gui/set/cards_panel.hpp

@@ -82,6 +82,7 @@ class CardsPanel : public SetWindowPanel {
 	TextCtrl*         notes;
 	HoverButton*      collapse_notes;
 	FilterCtrl*       filter;
+	String            filter_value; // value of filter, need separate variable because the control is destroyed
 	bool              notes_below_editor;
 	
 	/// Move the notes panel below the editor or below the card list

src/gui/set/keywords_panel.cpp

@@ -135,7 +135,12 @@ void KeywordsPanel::initUI(wxToolBar* tb, wxMenuBar* mb) {
 	tb->AddTool(ID_KEYWORD_REMOVE,	_(""), load_resource_tool_image(_("keyword_del")),	wxNullBitmap, wxITEM_NORMAL,_TOOLTIP_("remove keyword"),_HELP_("remove keyword"));
 	// Filter/search textbox
 	tb->AddSeparator();
-	if (!filter) filter = new FilterCtrl(tb, ID_KEYWORD_FILTER, _LABEL_("search keywords"));
+	assert(!filter);
+	if (!filter) {
+		filter = new FilterCtrl(tb, ID_KEYWORD_FILTER, _LABEL_("search keywords"));
+		// the control should show what the list is still filtered by
+		filter->setFilter(filter_value);
+	}
 	tb->AddControl(filter);
 	tb->Realize();
 	// Menus
@@ -146,7 +151,11 @@ void KeywordsPanel::destroyUI(wxToolBar* tb, wxMenuBar* mb) {
 	// Toolbar
 	tb->DeleteTool(ID_KEYWORD_ADD);
 	tb->DeleteTool(ID_KEYWORD_REMOVE);
-	tb->DeleteTool(filter->GetId()); filter = nullptr;
+	// remember the value in the filter control, because the card list remains filtered
+	// the control is destroyed by DeleteTool
+	filter_value = filter->getFilterString();
+	tb->DeleteTool(filter->GetId());
+	filter = nullptr;
 	// HACK: hardcoded size of rest of toolbar
 	tb->DeleteToolByPos(12); // delete separator
 	// Menus

src/gui/set/keywords_panel.hpp

@@ -72,6 +72,7 @@ class KeywordsPanel : public SetWindowPanel {
 	wxButton*         add_param;
 	wxButton*         ref_param;
 	FilterCtrl*       filter;
+	String            filter_value;
 	
 	// --------------------------------------------------- : Events
 	void onKeywordSelect(KeywordSelectEvent& ev);