From b3fbbd12c1c623e108103c5be20febbecc730777 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 3 Nov 2020 02:18:04 +0100 Subject: Matrix: update body item filter when switching tab --- src/QuickMedia.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/QuickMedia.cpp') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 61e59a3..fe2e7b0 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -898,7 +898,7 @@ namespace QuickMedia { for(Tab &tab : tabs) { tab.body->thumbnail_max_size = tab.page->get_thumbnail_max_size(); - tab.page->on_navigate_to_page(tab.body->items); + tab.page->on_navigate_to_page(tab.body.get()); } const Json::Value *json_chapters = &Json::Value::nullSingleton(); @@ -1026,7 +1026,7 @@ namespace QuickMedia { } else { page_loop(new_tabs); } - tabs[selected_tab].page->on_navigate_to_page(tabs[selected_tab].body->items); + tabs[selected_tab].page->on_navigate_to_page(tabs[selected_tab].body.get()); if(content_storage_json.isObject()) { const Json::Value &chapters_json = content_storage_json["chapters"]; if(chapters_json.isObject()) @@ -4238,7 +4238,8 @@ namespace QuickMedia { auto rooms_body = create_body(); rooms_body->thumbnail_mask_shader = &circle_mask_shader; - auto matrix_rooms_page = std::make_unique(this, rooms_body.get(), "All rooms"); + auto matrix_rooms_page_search_bar = create_search_bar("Search...", SEARCH_DELAY_FILTER); + auto matrix_rooms_page = std::make_unique(this, rooms_body.get(), "All rooms", nullptr, matrix_rooms_page_search_bar.get()); auto rooms_tags_body = create_body(); rooms_tags_body->thumbnail_mask_shader = &circle_mask_shader; @@ -4252,7 +4253,7 @@ namespace QuickMedia { matrix->start_sync(&matrix_handler); std::vector tabs; - tabs.push_back(Tab{std::move(rooms_body), std::move(matrix_rooms_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)}); + tabs.push_back(Tab{std::move(rooms_body), std::move(matrix_rooms_page), std::move(matrix_rooms_page_search_bar)}); tabs.push_back(Tab{std::move(rooms_tags_body), std::move(matrix_rooms_tag_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)}); tabs.push_back(Tab{std::move(invites_body), std::move(matrix_invites_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)}); -- cgit v1.2.3