ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ImGuiFullscreen: Fix navigating to root on Linux

This commit is contained in:
Connor McLaughlin 2022-11-26 02:03:38 +10:00 committed by refractionpcsx2
parent e17f592602
commit d08f4df146
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/Frontend/ImGuiFullscreen.cpp
View File

@ -1584,8 +1584,8 @@ void ImGuiFullscreen::PopulateFileSelectorItems()
{ {
for (std::string& root_path : FileSystem::GetRootDirectoryList()) for (std::string& root_path : FileSystem::GetRootDirectoryList())
{ {
s_file_selector_items.emplace_back( std::string title(fmt::format(ICON_FA_FOLDER " {}", root_path));
StringUtil::StdStringFromFormat(ICON_FA_FOLDER " %s", root_path.c_str()), std::move(root_path), false); s_file_selector_items.emplace_back(std::move(title), std::move(root_path), false);
} }
} }
else else
@ -1599,7 +1599,12 @@ void ImGuiFullscreen::PopulateFileSelectorItems()
if (sep_pos != std::string::npos) if (sep_pos != std::string::npos)
{ {
parent_path = s_file_selector_current_directory.substr(0, sep_pos); parent_path = s_file_selector_current_directory.substr(0, sep_pos);
//FIXME FileSystem::CanonicalizePath(parent_path, true);
#ifndef _WIN32
// Special case for going to root list on Linux.
if (parent_path.empty() && s_file_selector_current_directory.size() > 1)
parent_path = "/";
#endif
} }
s_file_selector_items.emplace_back(ICON_FA_FOLDER_OPEN " <Parent Directory>", std::move(parent_path), false); s_file_selector_items.emplace_back(ICON_FA_FOLDER_OPEN " <Parent Directory>", std::move(parent_path), false);
@ -1607,19 +1612,16 @@ void ImGuiFullscreen::PopulateFileSelectorItems()
if ((lhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY) != (rhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY)) if ((lhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY) != (rhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY))
return (lhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY) != 0; return (lhs.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY) != 0;
// return std::lexicographical_compare(lhs.FileName.begin(), lhs.FileName.end(), rhs.FileName.begin(), return std::lexicographical_compare(lhs.FileName.begin(), lhs.FileName.end(), rhs.FileName.begin(), rhs.FileName.end());
// rhs.FileName.end());
return (StringUtil::Strcasecmp(lhs.FileName.c_str(), rhs.FileName.c_str()) < 0);
}); });
for (const FILESYSTEM_FIND_DATA& fd : results) for (const FILESYSTEM_FIND_DATA& fd : results)
{ {
std::string full_path(StringUtil::StdStringFromFormat( std::string full_path(Path::Combine(s_file_selector_current_directory, fd.FileName));
"%s" FS_OSPATH_SEPARATOR_STR "%s", s_file_selector_current_directory.c_str(), fd.FileName.c_str()));
if (fd.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY) if (fd.Attributes & FILESYSTEM_FILE_ATTRIBUTE_DIRECTORY)
{ {
std::string title(StringUtil::StdStringFromFormat(ICON_FA_FOLDER " %s", fd.FileName.c_str())); std::string title(fmt::format(ICON_FA_FOLDER " {}", fd.FileName));
s_file_selector_items.emplace_back(std::move(title), std::move(full_path), false); s_file_selector_items.emplace_back(std::move(title), std::move(full_path), false);
} }
else else
@ -1631,7 +1633,7 @@ void ImGuiFullscreen::PopulateFileSelectorItems()
continue; continue;
} }
std::string title(StringUtil::StdStringFromFormat(ICON_FA_FILE " %s", fd.FileName.c_str())); std::string title(fmt::format(ICON_FA_FILE " {}", fd.FileName));
s_file_selector_items.emplace_back(std::move(title), std::move(full_path), true); s_file_selector_items.emplace_back(std::move(title), std::move(full_path), true);
} }
} }
@ -1640,7 +1642,7 @@ void ImGuiFullscreen::PopulateFileSelectorItems()
void ImGuiFullscreen::SetFileSelectorDirectory(std::string dir) void ImGuiFullscreen::SetFileSelectorDirectory(std::string dir)
{ {
while (!dir.empty() && dir.back() == FS_OSPATH_SEPARATOR_CHARACTER) while (dir.size() > 1 && dir.back() == FS_OSPATH_SEPARATOR_CHARACTER)
dir.erase(dir.size() - 1); dir.erase(dir.size() - 1);
s_file_selector_current_directory = std::move(dir); s_file_selector_current_directory = std::move(dir);