mount/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix roll-over in file browser and archive (#2811)

Browse Source
This commit is contained in:
Astra 2023-06-28 14:46:42 +03:00 committed by GitHub
parent 6f1c46e11d
commit bf975ad786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
applications/main/archive/views/archive_browser_view.c
View File

@ -345,11 +345,13 @@ static bool archive_view_input(InputEvent* event, void* context) {
if(event->key == InputKeyUp) { if(event->key == InputKeyUp) {
if(model->item_idx < scroll_speed) { if(model->item_idx < scroll_speed) {
scroll_speed = model->item_idx; model->button_held_for_ticks = 0;
model->item_idx = model->item_cnt - 1;
} else {
model->item_idx =
((model->item_idx - scroll_speed) + model->item_cnt) %
model->item_cnt;
} }
model->item_idx =
((model->item_idx - scroll_speed) + model->item_cnt) % model->item_cnt;
if(is_file_list_load_required(model)) { if(is_file_list_load_required(model)) {
model->list_loading = true; model->list_loading = true;
browser->callback(ArchiveBrowserEventLoadPrevItems, browser->context); browser->callback(ArchiveBrowserEventLoadPrevItems, browser->context);
@ -361,11 +363,12 @@ static bool archive_view_input(InputEvent* event, void* context) {
model->button_held_for_ticks += 1; model->button_held_for_ticks += 1;
} else if(event->key == InputKeyDown) { } else if(event->key == InputKeyDown) {
int32_t count = model->item_cnt; int32_t count = model->item_cnt;
if(model->item_idx >= (count - scroll_speed)) { if(model->item_idx + scroll_speed >= count) {
scroll_speed = model->item_cnt - model->item_idx - 1; model->button_held_for_ticks = 0;
model->item_idx = 0;
} else {
model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
} }
model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
if(is_file_list_load_required(model)) { if(is_file_list_load_required(model)) {
model->list_loading = true; model->list_loading = true;
browser->callback(ArchiveBrowserEventLoadNextItems, browser->context); browser->callback(ArchiveBrowserEventLoadNextItems, browser->context);

17
applications/services/gui/modules/file_browser.c
View File

@ -602,11 +602,13 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
if(event->key == InputKeyUp) { if(event->key == InputKeyUp) {
if(model->item_idx < scroll_speed) { if(model->item_idx < scroll_speed) {
scroll_speed = model->item_idx; model->button_held_for_ticks = 0;
model->item_idx = model->item_cnt - 1;
} else {
model->item_idx =
((model->item_idx - scroll_speed) + model->item_cnt) %
model->item_cnt;
} }
model->item_idx =
((model->item_idx - scroll_speed) + model->item_cnt) % model->item_cnt;
if(browser_is_list_load_required(model)) { if(browser_is_list_load_required(model)) {
model->list_loading = true; model->list_loading = true;
int32_t load_offset = CLAMP( int32_t load_offset = CLAMP(
@ -622,10 +624,11 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
} else if(event->key == InputKeyDown) { } else if(event->key == InputKeyDown) {
int32_t count = model->item_cnt; int32_t count = model->item_cnt;
if(model->item_idx + scroll_speed >= count) { if(model->item_idx + scroll_speed >= count) {
scroll_speed = count - model->item_idx - 1; model->button_held_for_ticks = 0;
model->item_idx = 0;
} else {
model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
} }
model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
if(browser_is_list_load_required(model)) { if(browser_is_list_load_required(model)) {
model->list_loading = true; model->list_loading = true;
int32_t load_offset = CLAMP( int32_t load_offset = CLAMP(