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

Refactoring

Browse Source 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
This commit is contained in:
QazCetelic 2024-09-24 12:32:49 +02:00
parent b675406b1a
commit f641f3acda
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
launcher/icons/IconList.cpp
View File

@ -169,8 +169,8 @@ QSet<QString> toStringSet(const QList<QString>& list) // Split into a separate f
void IconList::directoryChanged(const QString& path) void IconList::directoryChanged(const QString& path)
{ {
QDir new_dir(path); QDir newDir(path);
if (m_dir.absolutePath() != new_dir.absolutePath()) { if (m_dir.absolutePath() != newDir.absolutePath()) {
m_dir.setPath(path); m_dir.setPath(path);
m_dir.refresh(); m_dir.refresh();
if (is_watching) if (is_watching)
@ -183,19 +183,14 @@ void IconList::directoryChanged(const QString& path)
m_dir.refresh(); m_dir.refresh();
const QStringList newFileNamesList = getIconFilePaths(); const QStringList newFileNamesList = getIconFilePaths();
const QSet<QString> newSet = toStringSet(newFileNamesList); const QSet<QString> newSet = toStringSet(newFileNamesList);
QList<QString> current_list; QSet<QString> currentSet;
for (auto& it : icons) { for (const MMCIcon& it : icons) {
if (!it.has(IconType::FileBased)) if (!it.has(IconType::FileBased))
continue; continue;
current_list.push_back(it.m_images[IconType::FileBased].filename); currentSet.insert(it.m_images[IconType::FileBased].filename);
} }
const QSet<QString> currentSet = toStringSet(current_list); QSet<QString> toRemove = currentSet - newSet;
QSet<QString> toAdd = newSet - currentSet;
QSet<QString> toRemove = currentSet;
toRemove -= newSet;
QSet<QString> toAdd = newSet;
toAdd -= currentSet;
for (const auto& remove : toRemove) { for (const auto& remove : toRemove) {
qDebug() << "Removing " << remove; qDebug() << "Removing " << remove;
@ -456,11 +451,9 @@ void IconList::saveIcon(const QString& key, const QString& path, const char* for
void IconList::reindex() void IconList::reindex()
{ {
name_index.clear(); name_index.clear();
int i = 0; for (int i = 0; i < icons.size(); i++) {
for (auto& iter : icons) { name_index[icons[i].m_key] = i;
name_index[iter.m_key] = i; emit iconUpdated(icons[i].m_key); // prevents incorrect indices with proxy model
i++;
emit iconUpdated(iter.m_key); // prevents incorrect indices with proxy model
} }
} }
@ -471,7 +464,7 @@ QIcon IconList::getIcon(const QString& key) const
if (iconIndex != -1) if (iconIndex != -1)
return icons[iconIndex].icon(); return icons[iconIndex].icon();
// Fallback for icons that don't exist. // Fallback for icons that don't exist.b
iconIndex = getIconIndex("grass"); iconIndex = getIconIndex("grass");
if (iconIndex != -1) if (iconIndex != -1)