mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2025-03-14 13:20:59 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE fix missing icons on some systems

Browse Source
This commit is contained in:
Petr Mrázek 2025-01-09 17:36:56 +01:00
parent 8b65ad3aea
commit 469053439a
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
launcher/icons/IconList.cpp
View File

@ -28,6 +28,7 @@
IconList::IconList(const QStringList &builtinPaths, QString path, QObject *parent) : QAbstractListModel(parent)
{
QSet<QString> builtinNames;
m_logoIcon = QIcon(":/logo.svg");
builtinNames.insert("logo");
// add builtin icons
@ -329,6 +330,7 @@ bool IconList::addThemeIcon(const QString& key)
beginInsertRows(QModelIndex(), icons.size(), icons.size());
{
MMCIcon mmc_icon;
mmc_icon.m_logoIcon = m_logoIcon;
mmc_icon.m_name = key;
mmc_icon.m_key = key;
mmc_icon.replace(Builtin, key);
@ -360,6 +362,7 @@ bool IconList::addIcon(const QString &key, const QString &name, const QString &p
beginInsertRows(QModelIndex(), icons.size(), icons.size());
{
MMCIcon mmc_icon;
mmc_icon.m_logoIcon = m_logoIcon;
mmc_icon.m_name = name;
mmc_icon.m_key = key;
mmc_icon.replace(type, icon, path);

1
launcher/icons/IconList.h
View File

@ -84,4 +84,5 @@ private:
QMap<QString, int> name_index;
QVector<MMCIcon> icons;
QDir m_dir;
QIcon m_logoIcon;
};

4
launcher/icons/MMCIcon.cpp
View File

@ -17,8 +17,6 @@
#include <QFileInfo>
#include <xdgicon.h>
QIcon logoIcon = QIcon(":/logo.svg");
IconType operator--(IconType &t, int)
{
IconType temp = t;
@ -62,7 +60,7 @@ QIcon MMCIcon::icon() const
}
if(m_current_type == IconType::Builtin && m_key == "logo")
{
return logoIcon;
return m_logoIcon;
}
auto & icon = m_images[m_current_type].icon;
if(!icon.isNull())

1
launcher/icons/MMCIcon.h
View File

@ -39,6 +39,7 @@ struct MMCImage
struct MMCIcon
{
QIcon m_logoIcon;
QString m_key;
QString m_name;
MMCImage m_images[ICONS_TOTAL];