diff options
| author | dec05eba <dec05eba@protonmail.com> | 2021-05-12 14:51:41 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2021-05-12 14:51:41 +0200 |
| commit | b69bc964dd6053d9a20803f79a2dfcb7a51dc83a (patch) | |
| tree | 9ab07073cb87373681d1bb6b85323320d57927a3 /src/QuickMedia.cpp | |
| parent | f1063e25a55aec5a8f7b294d0392dd31d5bf9813 (diff) | |
Once upon a time there was a turtle. The turtle was retarded and didn't know what he does. That turtle was me
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
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<void()> on_top_reached = [this, &previous_messages_future, &ui_tabs, &MESSAGES_TAB_INDEX, &gradient_inc, current_room, &fetching_prev_failed] { + std::function<void()> 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<Messages>([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); |