From 7ae4e8a8e681e81558cf2218696439e5dd7c92d9 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 29 Apr 2025 15:12:07 -0400 Subject: [PATCH] Remove Gamescope support I don't use this anymore, as I was using it as a band-aid for Wine XWayland bugs. Now that they're a thing of the past, lets kill this. --- launcher/profileconfig.kcfg | 18 ------- launcher/src/gamerunner.cpp | 30 ----------- launcher/ui/Settings/ProfileSettings.qml | 65 ------------------------ 3 files changed, 113 deletions(-) diff --git a/launcher/profileconfig.kcfg b/launcher/profileconfig.kcfg index 45d8d48..23e4fe1 100644 --- a/launcher/profileconfig.kcfg +++ b/launcher/profileconfig.kcfg @@ -34,27 +34,9 @@ SPDX-License-Identifier: CC0-1.0 BuiltIn - - false - false - - false - - - false - - - 1280 - - - 720 - - - 60 - false diff --git a/launcher/src/gamerunner.cpp b/launcher/src/gamerunner.cpp index ea7d99f..ff38fa6 100644 --- a/launcher/src/gamerunner.cpp +++ b/launcher/src/gamerunner.cpp @@ -259,9 +259,6 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con setWindowsVersion(profile, QStringLiteral("win7")); - // TODO: band-aid fix to wait for wine to exit, otherwise gamescope will collide - QThread::sleep(2); - // copy DXVK const QDir dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); const QDir compatibilityToolDir = dataDir.absoluteFilePath(QStringLiteral("tool")); @@ -282,33 +279,6 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con #endif } - if (isGame && profile.config()->useGamescope()) { - arguments.push_back(QStringLiteral("gamescope")); - - if (profile.config()->gamescopeFullscreen()) - arguments.push_back(QStringLiteral("-f")); - - if (profile.config()->gamescopeBorderless()) - arguments.push_back(QStringLiteral("-b")); - - if (profile.config()->gamescopeWidth() > 0) { - arguments.push_back(QStringLiteral("-w")); - arguments.push_back(QString::number(profile.config()->gamescopeWidth())); - } - - if (profile.config()->gamescopeHeight() > 0) { - arguments.push_back(QStringLiteral("-h")); - arguments.push_back(QString::number(profile.config()->gamescopeHeight())); - } - - if (profile.config()->gamescopeRefreshRate() > 0) { - arguments.push_back(QStringLiteral("-r")); - arguments.push_back(QString::number(profile.config()->gamescopeRefreshRate())); - } - - arguments.push_back(QStringLiteral("--")); - } - if (m_launcher.config()->enableRenderDocCapture()) { env.insert(QStringLiteral("VK_LAYER_RENDERDOC_Capture"), QStringLiteral("VK_LAYER_RENDERDOC_Capture")); env.insert(QStringLiteral("ENABLE_VULKAN_RENDERDOC_CAPTURE"), QString::number(1)); diff --git a/launcher/ui/Settings/ProfileSettings.qml b/launcher/ui/Settings/ProfileSettings.qml index b50b958..753a24d 100644 --- a/launcher/ui/Settings/ProfileSettings.qml +++ b/launcher/ui/Settings/ProfileSettings.qml @@ -44,11 +44,6 @@ FormCard.FormCardPage { text: i18n("Wine") visible: !LauncherCore.isWindows }, - Kirigami.Action { - id: toolsAction - text: i18n("Tools") - visible: !LauncherCore.isWindows - }, Kirigami.Action { id: dalamudAction text: i18n("Dalamud") @@ -177,66 +172,6 @@ FormCard.FormCardPage { } } - FormCard.FormCard { - visible: toolsAction.checked - - Layout.fillWidth: true - Layout.topMargin: Kirigami.Units.largeSpacing * 4 - - FormCard.FormCheckDelegate { - text: i18n("Enable Gamescope") - description: i18n("A micro-compositor that uses Wayland to create a nested session.\nIf you use fullscreen mode, it may improve input handling.") - checked: page.profile.config.useGamescope - onCheckedChanged: page.profile.config.useGamescope = checked - } - - FormCard.FormDelegateSeparator {} - - FormCard.FormButtonDelegate { - text: i18n("Configure Gamescope...") - icon.name: "configure" - enabled: page.profile.config.useGamescope - Kirigami.PromptDialog { - id: gamescopeSettingsDialog - title: i18n("Configure Gamescope") - parent: page - - Kirigami.FormLayout { - QQC2.CheckBox { - Kirigami.FormData.label: "Fullscreen:" - checked: page.profile.config.gamescopeFullscreen - onCheckedChanged: page.profile.config.gamescopeFullscreen = checked - } - QQC2.CheckBox { - Kirigami.FormData.label: "Borderless:" - checked: page.profile.config.gamescopeBorderless - onCheckedChanged: page.profile.config.gamescopeBorderless = checked - } - QQC2.SpinBox { - Kirigami.FormData.label: "Width:" - to: 4096 - value: page.profile.config.gamescopeWidth - onValueModified: page.profile.config.gamescopeWidth = value - } - QQC2.SpinBox { - Kirigami.FormData.label: "Height:" - to: 4096 - value: page.profile.config.gamescopeHeight - onValueModified: page.profile.config.gamescopeHeight = value - } - QQC2.SpinBox { - Kirigami.FormData.label: "Refresh Rate:" - to: 512 - value: page.profile.config.gamescopeRefreshRate - onValueModified: page.profile.config.gamescopeRefreshRate = value - } - } - } - - onClicked: gamescopeSettingsDialog.open() - } - } - FormCard.FormCard { visible: dalamudAction.checked