Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-11 23:38:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into badusb-ble

Browse Source
This commit is contained in:
Willy-JL
2023-02-07 01:09:12 +00:00
parent 3a10bbc227 3bd3b7f122
commit 1257bf209a
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/services/gui/modules/file_browser_worker.c
+3 -2
View File
@@ -230,7 +230,7 @@ static bool
// FLIPPER DEVS MOMENT
// this used to load the file list in chunks, and then sort it...
// so while scrolling, it loads more files and sorts them...
// chances are, the new files are higner in the sorted list...
// chances are, the new files are higher in the sorted list...
// so the files keep shifting around while scrolling...
// now this does something intelligent and loads all in one go.
// might take a few milliseconds longer, but atleast it works :kekw:
@@ -239,7 +239,8 @@ static bool
if(browser->list_load_cb) {
browser->list_load_cb(browser->cb_ctx, 0);
}
while(storage_dir_read(directory, &file_info, name_temp, FILE_NAME_LEN_MAX) && storage_file_get_error(directory) == FSE_OK) {
while(storage_dir_read(directory, &file_info, name_temp, FILE_NAME_LEN_MAX) &&
storage_file_get_error(directory) == FSE_OK) {
furi_string_set(name_str, name_temp);
if(browser_filter_by_name(browser, name_str, (file_info.flags & FSF_DIRECTORY))) {
furi_string_printf(name_str, "%s/%s", furi_string_get_cstr(path), name_temp);
applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
+7 -5
View File
@@ -161,11 +161,9 @@ void xtreme_settings_scene_start_on_enter(void* context) {
}
asset_packs_push_at(app->asset_packs, idx, copy);
if(current_pack != 0) {
if(idx <= current_pack)
current_pack++;
if(idx <= current_pack) current_pack++;
} else {
if(strcmp(copy, xtreme_settings->asset_pack) == 0)
current_pack = idx + 1;
if(strcmp(copy, xtreme_settings->asset_pack) == 0) current_pack = idx + 1;
}
}
}
@@ -228,7 +226,11 @@ void xtreme_settings_scene_start_on_enter(void* context) {
variable_item_set_current_value_text(item, battery_style_names[value_index]);
item = variable_item_list_add(
var_item_list, "Sort folders before", 2, xtreme_settings_scene_start_sort_folders_before_changed, app);
var_item_list,
"Sort dirs before",
2,
xtreme_settings_scene_start_sort_folders_before_changed,
app);
variable_item_set_current_value_index(item, !xtreme_settings->sort_ignore_dirs);
variable_item_set_current_value_text(item, !xtreme_settings->sort_ignore_dirs ? "ON" : "OFF");