From c60c32a05c4632682c9e0de77909e897175cc9ac Mon Sep 17 00:00:00 2001 From: dec05eba Date: Thu, 5 Nov 2020 17:56:12 +0100 Subject: Asdf sorting --- src/QuickMedia.cpp | 10 ++-------- src/plugins/Matrix.cpp | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 9bb5231..937510c 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -982,14 +982,8 @@ namespace QuickMedia { after_submit_handler(); if(tabs[selected_tab].page->clear_search_after_submit() && tabs[selected_tab].search_bar) { - if(!tabs[selected_tab].search_bar->get_text().empty()) { - tabs[selected_tab].search_bar->clear(); - tabs[selected_tab].search_bar->onTextUpdateCallback(""); - } else { - int selected_item_index = tabs[selected_tab].body->get_selected_item(); - tabs[selected_tab].body->select_first_item(); - tabs[selected_tab].body->set_selected_item(selected_item_index, false); - } + tabs[selected_tab].search_bar->clear(); + tabs[selected_tab].search_bar->onTextUpdateCallback(""); } if(tabs[selected_tab].page->is_single_page()) { diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index b99aa02..50296a8 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -469,7 +469,7 @@ namespace QuickMedia { void MatrixRoomsPage::on_navigate_to_page(Body *body) { if(search_bar) body->filter_search_fuzzy(search_bar->get_text()); - //sort_room_body_items(body->items); + sort_room_body_items(body->items); } void MatrixRoomsPage::update() { @@ -521,7 +521,7 @@ namespace QuickMedia { // Swap order of rooms in body list to put rooms with mentions at the top and then unread messages and then all the other rooms // TODO: Optimize with hash map instead of linear search? or cache the index std::lock_guard lock(mutex); -#if 1 +#if 0 BodyItem *room_body_item = static_cast(room->userdata); int room_body_index = body->get_index_by_body_item(room_body_item); if(room_body_index != -1) { -- cgit v1.2.3