Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-29 05:10:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes for ci errors IV

Browse Source 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
This commit is contained in:
QazCetelic 2024-09-11 10:07:05 +02:00
parent f7f7c4b43e
commit 7b49fd6508
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/icons/IconList.cpp
View File

@ -35,7 +35,6 @@
*/ */
#include "IconList.h" #include "IconList.h"
#include <filesystem>
#include <FileSystem.h> #include <FileSystem.h>
#include <QDebug> #include <QDebug>
#include <QEventLoop> #include <QEventLoop>
@ -79,8 +78,8 @@ void IconList::sortIconList()
{ {
qDebug() << "Sorting icon list..."; qDebug() << "Sorting icon list...";
std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) { std::sort(icons.begin(), icons.end(), [](const MMCIcon& a, const MMCIcon& b) {
bool aIsSubdir = a.m_key.contains(std::filesystem::path::preferred_separator); bool aIsSubdir = a.m_key.contains(QDir::separator());
bool bIsSubdir = b.m_key.contains(std::filesystem::path::preferred_separator); bool bIsSubdir = b.m_key.contains(QDir::separator());
if (aIsSubdir != bIsSubdir) { if (aIsSubdir != bIsSubdir) {
return !aIsSubdir; // root-level icons come first return !aIsSubdir; // root-level icons come first
} }
@ -158,9 +157,8 @@ QString formatName(const QDir& icons_dir, const QFileInfo& file)
return file.baseName(); return file.baseName();
constexpr auto delimiter = " » "; constexpr auto delimiter = " » ";
constexpr auto fs_separator = std::filesystem::path::preferred_separator; QString relative_path_without_extension = icons_dir.relativeFilePath(file.dir().path()) + QDir::separator() + file.baseName();
QString relative_path_without_extension = icons_dir.relativeFilePath(file.dir().path()) + fs_separator + file.baseName(); return relative_path_without_extension.replace(QDir::separator(), delimiter);
return relative_path_without_extension.replace(fs_separator, delimiter);
} }
void IconList::directoryChanged(const QString& path) void IconList::directoryChanged(const QString& path)