XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Fix serverlist scrolling

Browse Source
This commit is contained in:
Maurice Heumann 2021-05-01 18:16:36 +02:00
parent 49bc9f0326
commit 56875d65f7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/component/server_list.cpp
View File

@ -43,8 +43,8 @@ namespace server_list
std::vector<server_info> servers; std::vector<server_info> servers;
size_t server_list_page = 0; size_t server_list_page = 0;
volatile bool update_server_list = false; volatile bool update_server_list = false;
std::chrono::high_resolution_clock::time_point last_scroll{};
size_t get_page_count() size_t get_page_count()
{ {
@ -220,6 +220,11 @@ namespace server_list
return game::Menu_IsMenuOpenAndVisible(0, "menu_systemlink_join"); return game::Menu_IsMenuOpenAndVisible(0, "menu_systemlink_join");
} }
bool is_scrolling_disabled()
{
return update_server_list || (std::chrono::high_resolution_clock::now() - last_scroll) < 500ms;
}
bool scroll_down() bool scroll_down()
{ {
if (!is_server_list_open()) if (!is_server_list_open())
@ -227,8 +232,9 @@ namespace server_list
return false; return false;
} }
if (server_list_page + 1 < get_page_count()) if (!is_scrolling_disabled() && server_list_page + 1 < get_page_count())
{ {
last_scroll = std::chrono::high_resolution_clock::now();
++server_list_page; ++server_list_page;
trigger_refresh(); trigger_refresh();
} }
@ -243,8 +249,9 @@ namespace server_list
return false; return false;
} }
if (server_list_page > 0) if (!is_scrolling_disabled() && server_list_page > 0)
{ {
last_scroll = std::chrono::high_resolution_clock::now();
--server_list_page; --server_list_page;
trigger_refresh(); trigger_refresh();
} }