Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-07-21 19:12:16 +03:00
54 changed files with 1293 additions and 606 deletions

View File

@ -52,6 +52,7 @@
#include <cstddef>
#include "VisualGroup.h"
#include "ui/themes/ThemeManager.h"
#include <QDebug>
#include <Application.h>
#include <InstanceList.h>
@ -504,7 +505,7 @@ void InstanceView::setPaintCat(bool visible)
{
m_catVisible = visible;
if (visible)
m_catPixmap.load(QString(":/backgrounds/%1").arg(ThemeManager::getCatImage()));
m_catPixmap.load(APPLICATION->getCatPack());
else
m_catPixmap = QPixmap();
}