feat(upstream): merge PrismLauncher 10.0.1

Signed-off-by: so5iso4ka <so5iso4ka@icloud.com>

Author: so5iso4ka

launcher/Application.cpp

@@ -52,6 +52,7 @@
 #include "tools/GenericProfiler.h"
 #include "ui/InstanceWindow.h"
 #include "ui/MainWindow.h"
+#include "ui/ToolTipFilter.h"
 #include "ui/ViewLogWindow.h"
 
 #include "ui/dialogs/ProgressDialog.h"
@@ -1222,6 +1223,10 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         }
     }
 
+    if (qgetenv("XDG_CURRENT_DESKTOP") == "gamescope") {
+        installEventFilter(new ToolTipFilter);
+    }
+
     if (createSetupWizard()) {
         return;
     }

launcher/CMakeLists.txt

@@ -888,6 +888,8 @@ SET(LAUNCHER_SOURCES
     ui/InstanceWindow.cpp
     ui/ViewLogWindow.h
     ui/ViewLogWindow.cpp
+    ui/ToolTipFilter.h
+    ui/ToolTipFilter.cpp
 
     # FIXME: maybe find a better home for this.
     FileIgnoreProxy.cpp

launcher/InstanceImportTask.cpp

@@ -150,22 +150,17 @@ void InstanceImportTask::processZipPack()
             extractDir.cd("minecraft");
             m_modpackType = ModpackType::Technic;
             stop = true;
-        } else {
-            QFileInfo fileInfo(fileName);
-            if (fileInfo.fileName() == "instance.cfg") {
-                qDebug() << "MultiMC:" << true;
-                m_modpackType = ModpackType::MultiMC;
-                root = cleanPath(fileInfo.path());
-                stop = true;
-                return true;
-            }
-            if (fileInfo.fileName() == "manifest.json") {
-                qDebug() << "Flame:" << true;
-                m_modpackType = ModpackType::Flame;
-                root = cleanPath(fileInfo.path());
-                stop = true;
-                return true;
-            }
+        } else if (fileName == "manifest.json") {
+            qDebug() << "Flame:" << true;
+            m_modpackType = ModpackType::Flame;
+            stop = true;
+            return true;
+        } else if (QFileInfo fileInfo(fileName); fileInfo.fileName() == "instance.cfg") {
+            qDebug() << "MultiMC:" << true;
+            m_modpackType = ModpackType::MultiMC;
+            root = cleanPath(fileInfo.path());
+            stop = true;
+            return true;
         }
         QCoreApplication::processEvents();
         return true;

launcher/icons/IconList.cpp

@@ -40,6 +40,7 @@
 #include <QFileSystemWatcher>
 #include <QMap>
 #include <QMimeData>
+#include <QPixmap>
 #include <QSet>
 #include <QUrl>
 #include "icons/IconUtils.h"
@@ -217,7 +218,13 @@ void IconList::fileChanged(const QString& path)
     int idx = getIconIndex(key);
     if (idx == -1)
         return;
-    QIcon icon(path);
+    QIcon icon;
+    // special handling for jpg and jpeg to go through pixmap to keep the size constant
+    if (path.endsWith(".jpg") || path.endsWith(".jpeg")) {
+        icon.addPixmap(QPixmap(path));
+    } else {
+        icon.addFile(path);
+    }
     if (icon.availableSizes().empty())
         return;
 
@@ -395,7 +402,14 @@ bool IconList::addThemeIcon(const QString& key)
 bool IconList::addIcon(const QString& key, const QString& name, const QString& path, const IconType type)
 {
     // replace the icon even? is the input valid?
-    QIcon icon(path);
+    QIcon icon;
+    // special handling for jpg and jpeg to go through pixmap to keep the size constant
+    if (path.endsWith(".jpg") || path.endsWith(".jpeg")) {
+        icon.addPixmap(QPixmap(path));
+    } else {
+        icon.addFile(path);
+    }
+
     if (icon.isNull())
         return false;
     auto iter = m_nameIndex.find(key);

launcher/minecraft/mod/ResourceFolderModel.cpp

@@ -335,7 +335,7 @@ bool ResourceFolderModel::update()
         },
         Qt::ConnectionType::QueuedConnection);
 
-    Task::Ptr preUpdate{createPreUpdateTask()};
+    Task::Ptr preUpdate{ createPreUpdateTask() };
 
     if (preUpdate != nullptr) {
         auto task = new SequentialTask("ResourceFolderModel::update");

launcher/minecraft/mod/ShaderPackFolderModel.cpp

@@ -1,5 +1,5 @@
-#include "FileSystem.h"
 #include "ShaderPackFolderModel.h"
+#include "FileSystem.h"
 
 namespace {
 class ShaderPackIndexMigrateTask : public Task {

launcher/minecraft/mod/tasks/LocalResourceUpdateTask.cpp

@@ -35,7 +35,13 @@ LocalResourceUpdateTask::LocalResourceUpdateTask(QDir index_dir, ModPlatform::In
     }
 
 #ifdef Q_OS_WIN32
-    SetFileAttributesW(index_dir.path().toStdWString().c_str(), FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
+    std::wstring wpath = index_dir.path().toStdWString();
+    if (index_dir.dirName().startsWith('.')) {
+        SetFileAttributesW(wpath.c_str(), FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
+    } else {
+        // fix shaderpacks folder being hidden by Prism Launcher 10.0.1
+        SetFileAttributesW(wpath.c_str(), FILE_ATTRIBUTE_NORMAL);
+    }
 #endif
 }
 

launcher/net/NetRequest.cpp

@@ -169,9 +169,11 @@ void NetRequest::downloadError(QNetworkReply::NetworkError error)
             }
         }
         // error happened during download.
-        qCCritical(logCat) << getUid().toString() << "Failed" << m_url.toString() << "with reason" << error;
+        qCCritical(logCat) << getUid().toString() << "Failed" << m_url.toString() << "with error" << error;
         if (m_reply)
-            qCCritical(logCat) << getUid().toString() << "HTTP Status" << replyStatusCode() << ";error" << errorString();
+            qCCritical(logCat) << getUid().toString() << "HTTP status:" << replyStatusCode() << errorString();
+        if (m_errorResponse.size() > 0)
+            qCCritical(logCat) << getUid().toString() << "Response from server:" << m_errorResponse;
         m_state = State::Failed;
     }
 }
@@ -308,6 +310,9 @@ void NetRequest::downloadReadyRead()
     if (m_state == State::Running) {
         auto data = m_reply->readAll();
         m_state = m_sink->write(data);
+        if (replyStatusCode() >= 400) {
+            m_errorResponse.append(data);
+        }
         if (m_state == State::Failed) {
             qCCritical(logCat) << getUid().toString() << "Failed to process response chunk:" << m_sink->failReason();
         }

launcher/net/NetRequest.h

@@ -106,6 +106,7 @@ class NetRequest : public Task {
 
     /// the network reply
     unique_qobject_ptr<QNetworkReply> m_reply;
+    QByteArray m_errorResponse;
 
     /// source URL
     QUrl m_url;

launcher/ui/ToolTipFilter.cpp

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2026 Mark Deneen <mdeneen@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ToolTipFilter.h"
+
+bool ToolTipFilter::eventFilter(QObject* obj, QEvent* ev)
+{
+    if (ev->type() == QEvent::ToolTip) {
+        return true;
+    } else {
+        return QObject::eventFilter(obj, ev);
+    }
+}