Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

File Browser: Enable 5 Step Scrolling #2730

Closed
wants to merge 8 commits into from
Closed

File Browser: Enable 5 Step Scrolling #2730

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cebb6aa
5 Step Scrolling
asizon Jun 4, 2023
53a496a
clang formatting fixes
asizon Jun 4, 2023
52f228a
formating fix
asizon Jun 4, 2023
a86d118
Merge branch 'dev' into 5_step_scroll
hedger Jun 6, 2023
5e53a0a
Merge branch 'dev' into 5_step_scroll
hedger Jun 6, 2023
e79605d
Merge branch 'dev' into 5_step_scroll
asizon Jun 7, 2023
abb6d75
Merge branch 'dev' into 5_step_scroll
asizon Jun 8, 2023
aa1e696
Merge branch 'dev' into 5_step_scroll
skotopes Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions applications/services/gui/modules/file_browser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ typedef struct {
bool is_root;
bool folder_loading;
bool list_loading;
bool large_step;
uint32_t item_cnt;
int32_t item_idx;
int32_t array_offset;
Expand Down Expand Up @@ -577,6 +578,7 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
furi_assert(browser);
bool consumed = false;
bool is_loading = false;
uint8_t step_weight;

with_view_model(
browser->view, FileBrowserModel * model, { is_loading = model->folder_loading; }, false);
Expand All @@ -589,9 +591,14 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
browser->view,
FileBrowserModel * model,
{
if(model->large_step) {
step_weight = 5;
} else {
step_weight = 1;
}
if(event->key == InputKeyUp) {
model->item_idx =
((model->item_idx - 1) + model->item_cnt) % model->item_cnt;
((model->item_idx - step_weight) + model->item_cnt) % model->item_cnt;
if(browser_is_list_load_required(model)) {
model->list_loading = true;
int32_t load_offset = CLAMP(
Expand All @@ -603,7 +610,7 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
}
model->scroll_counter = 0;
} else if(event->key == InputKeyDown) {
model->item_idx = (model->item_idx + 1) % model->item_cnt;
model->item_idx = (model->item_idx + step_weight) % model->item_cnt;
if(browser_is_list_load_required(model)) {
model->list_loading = true;
int32_t load_offset = CLAMP(
Expand Down Expand Up @@ -658,10 +665,17 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
if(event->type == InputTypeShort) {
bool is_root = false;
with_view_model(
browser->view, FileBrowserModel * model, { is_root = model->is_root; }, false);
if(!is_root) {
file_browser_worker_folder_exit(browser->worker);
}
browser->view,
FileBrowserModel * model,
{
is_root = model->is_root;
if(model->large_step) {
model->large_step = false;
} else if(!is_root) {
file_browser_worker_folder_exit(browser->worker);
}
},
false);
consumed = true;
}
} else if(event->key == InputKeyBack) {
Expand All @@ -675,6 +689,16 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
file_browser_worker_folder_exit(browser->worker);
}
}
} else if(event->key == InputKeyRight) {
with_view_model(
browser->view,
FileBrowserModel * model,
{
if(event->type == InputTypeShort) {
model->large_step = true;
}
},
false);
}

return consumed;
Expand Down