From a86993af91c3278a3523704dfb3a3f65a2508e95 Mon Sep 17 00:00:00 2001 From: Kyle Reed Date: Thu, 11 May 2023 22:54:42 -0700 Subject: [PATCH] Minor fileman bug fixes (#977) -sets max file count to 100, fixes partner rename and delete in subfolders. --- firmware/application/apps/ui_fileman.cpp | 4 ++-- firmware/application/apps/ui_fileman.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/application/apps/ui_fileman.cpp b/firmware/application/apps/ui_fileman.cpp index 58f4e895..cc837d5e 100644 --- a/firmware/application/apps/ui_fileman.cpp +++ b/firmware/application/apps/ui_fileman.cpp @@ -444,7 +444,7 @@ void FileManagerView::on_rename() { [this, renamed_path](const fs::path& partner, bool should_rename) mutable { if (should_rename) { auto new_name = renamed_path.replace_extension(partner.extension()); - rename_file(current_path / partner, current_path / new_name); + rename_file(partner, current_path / new_name); } reload_current(); } @@ -466,7 +466,7 @@ void FileManagerView::on_delete() { nav_, get_selected_full_path(), "Delete", [this](const fs::path& partner, bool should_delete) { if (should_delete) - delete_file(current_path / partner); + delete_file(partner); reload_current(); } ); diff --git a/firmware/application/apps/ui_fileman.hpp b/firmware/application/apps/ui_fileman.hpp index dc66581b..0ff09fa0 100644 --- a/firmware/application/apps/ui_fileman.hpp +++ b/firmware/application/apps/ui_fileman.hpp @@ -62,7 +62,7 @@ public: protected: static constexpr size_t max_filename_length = 64; - static constexpr size_t max_items_shown = 128; + static constexpr size_t max_items_shown = 100; struct file_assoc_t { std::filesystem::path extension;