From b69bc964dd6053d9a20803f79a2dfcb7a51dc83a Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 12 May 2021 14:51:41 +0200 Subject: Once upon a time there was a turtle. The turtle was retarded and didn't know what he does. That turtle was me --- src/QuickMedia.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/QuickMedia.cpp') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index ddeacab..3df2973 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3291,8 +3291,11 @@ namespace QuickMedia { } comment_navigation_stack.push(thread_body->get_selected_item()); comment_page_scroll_stack.push(thread_body->get_page_scroll()); - thread_body->clamp_selection(); - thread_body->set_page_scroll(0.0f); + //thread_body->clamp_selection(); + //thread_body->set_page_scroll(0.0f); + int prev_sel = thread_body->get_selected_item(); + thread_body->select_last_item(); + thread_body->set_selected_item(prev_sel, false); } else if(event.key.code == sf::Keyboard::BackSpace && !comment_navigation_stack.empty()) { size_t previous_selected = comment_navigation_stack.top(); float previous_page_scroll = comment_page_scroll_stack.top(); @@ -4864,10 +4867,9 @@ namespace QuickMedia { move_room = true; }; - bool fetching_prev_failed = false; - std::function on_top_reached = [this, &previous_messages_future, &ui_tabs, &MESSAGES_TAB_INDEX, &gradient_inc, current_room, &fetching_prev_failed] { + std::function on_top_reached = [this, &previous_messages_future, &ui_tabs, &MESSAGES_TAB_INDEX, &gradient_inc, current_room] { const int selected_tab = ui_tabs.get_selected(); - if(!fetching_prev_failed && !previous_messages_future.valid() && selected_tab == MESSAGES_TAB_INDEX) { + if(!previous_messages_future.valid() && selected_tab == MESSAGES_TAB_INDEX) { gradient_inc = 0; previous_messages_future = AsyncTask([this, current_room]() { Messages messages; @@ -5321,7 +5323,6 @@ namespace QuickMedia { all_messages.insert(all_messages.end(), new_messages.begin(), new_messages.end()); if(new_messages.empty()) { fetched_enough_messages = true; - fetching_prev_failed = true; } filter_sent_messages(new_messages); filter_existing_messages(new_messages); -- cgit v1.2.3