0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui2/tfile_dialog: Sort directory entries ignoring character case

Browse source
This commit is contained in:
Ignacio R. Morelle 2016-10-03 04:08:02 -03:00
parent 0cd131b537
commit 7b3fdedc85
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/dialogs/file_dialog.cpp
View file

@ -86,6 +86,15 @@ inline std::string filesystem_root()
return std::string(1, fs::path_separator());
}
inline void isort_dir_entries(std::vector<std::string>& entries)
{
// Yes, this uses Wesnoth's locale and not the filesystem/OS locale. Yes, this
// isn't ideal. No, we don't really need to worry about it. It's just a
// cosmetic procedure anyway.
std::sort(entries.begin(), entries.end(),
[](const std::string& a, const std::string& b) { return translation::icompare(a, b) < 0; });
}
} // unnamed namespace
namespace gui2
@ -384,6 +393,8 @@ void tfile_dialog::refresh_fileview(twindow& window)
// TODO: Need to detect and handle cases where we don't have search permission
// on current_dir_, otherwise things may get weird.
filesystem::get_files_in_dir(current_dir_, &dir_files_, &dir_subdirs_, filesystem::FILE_NAME_ONLY);
isort_dir_entries(dir_files_);
isort_dir_entries(dir_subdirs_);
//
// Clear and refill the filelist box.