redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-05-01 08:27:45 +00:00
Code Activity

Remove Gamescope support

Browse source 
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.
This commit is contained in:
Joshua Goins 2025-04-29 15:12:07 -04:00
parent 944a133ae7
commit 7ae4e8a8e6
3 changed files with 0 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
launcher/profileconfig.kcfg
View file

@ -34,27 +34,9 @@ SPDX-License-Identifier: CC0-1.0
</choices> </choices>
<default>BuiltIn</default> <default>BuiltIn</default>
</entry> </entry>
<entry key="UseGamescope" type="bool">
<default>false</default>
</entry>
<entry key="UseDX9" type="bool"> <entry key="UseDX9" type="bool">
<default>false</default> <default>false</default>
</entry> </entry>
<entry key="GamescopeFullscreen" type="bool">
<default>false</default>
</entry>
<entry key="GamescopeBorderless" type="bool">
<default>false</default>
</entry>
<entry key="GamescopeWidth" type="int">
<default>1280</default>
</entry>
<entry key="GamescopeHeight" type="int">
<default>720</default>
</entry>
<entry key="GamescopeRefreshRate" type="int">
<default>60</default>
</entry>
<entry key="DalamudEnabled" type="bool"> <entry key="DalamudEnabled" type="bool">
<default>false</default> <default>false</default>
</entry> </entry>

30
launcher/src/gamerunner.cpp
View file

@ -259,9 +259,6 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con
setWindowsVersion(profile, QStringLiteral("win7")); setWindowsVersion(profile, QStringLiteral("win7"));
// TODO: band-aid fix to wait for wine to exit, otherwise gamescope will collide
QThread::sleep(2);
// copy DXVK // copy DXVK
const QDir dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); const QDir dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
const QDir compatibilityToolDir = dataDir.absoluteFilePath(QStringLiteral("tool")); const QDir compatibilityToolDir = dataDir.absoluteFilePath(QStringLiteral("tool"));
@ -282,33 +279,6 @@ void GameRunner::launchExecutable(const Profile &profile, QProcess *process, con
#endif #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()) { if (m_launcher.config()->enableRenderDocCapture()) {
env.insert(QStringLiteral("VK_LAYER_RENDERDOC_Capture"), QStringLiteral("VK_LAYER_RENDERDOC_Capture")); env.insert(QStringLiteral("VK_LAYER_RENDERDOC_Capture"), QStringLiteral("VK_LAYER_RENDERDOC_Capture"));
env.insert(QStringLiteral("ENABLE_VULKAN_RENDERDOC_CAPTURE"), QString::number(1)); env.insert(QStringLiteral("ENABLE_VULKAN_RENDERDOC_CAPTURE"), QString::number(1));

65
launcher/ui/Settings/ProfileSettings.qml
View file

@ -44,11 +44,6 @@ FormCard.FormCardPage {
text: i18n("Wine") text: i18n("Wine")
visible: !LauncherCore.isWindows visible: !LauncherCore.isWindows
}, },
Kirigami.Action {
id: toolsAction
text: i18n("Tools")
visible: !LauncherCore.isWindows
},
Kirigami.Action { Kirigami.Action {
id: dalamudAction id: dalamudAction
text: i18n("Dalamud") 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 { FormCard.FormCard {
visible: dalamudAction.checked visible: dalamudAction.checked