redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-22 20:47:45 +00:00
Code Activity

Hide DirectX 9 option if not available

Browse source
This commit is contained in:
Joshua Goins 2024-03-23 12:51:48 -04:00
parent 2d217df1c6
commit 8e4c032b3c
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
launcher/include/profile.h
View file

@ -26,6 +26,7 @@ class Profile : public QObject
Q_PROPERTY(bool gamescopeEnabled READ gamescopeEnabled WRITE setGamescopeEnabled NOTIFY useGamescopeChanged) Q_PROPERTY(bool gamescopeEnabled READ gamescopeEnabled WRITE setGamescopeEnabled NOTIFY useGamescopeChanged)
Q_PROPERTY(bool gamemodeEnabled READ gamemodeEnabled WRITE setGamemodeEnabled NOTIFY useGamemodeChanged) Q_PROPERTY(bool gamemodeEnabled READ gamemodeEnabled WRITE setGamemodeEnabled NOTIFY useGamemodeChanged)
Q_PROPERTY(bool directx9Enabled READ directx9Enabled WRITE setDirectX9Enabled NOTIFY useDX9Changed) Q_PROPERTY(bool directx9Enabled READ directx9Enabled WRITE setDirectX9Enabled NOTIFY useDX9Changed)
Q_PROPERTY(bool hasDirectx9 READ hasDirectx9 NOTIFY gamePathChanged)
Q_PROPERTY(bool gamescopeFullscreen READ gamescopeFullscreen WRITE setGamescopeFullscreen NOTIFY gamescopeFullscreenChanged) Q_PROPERTY(bool gamescopeFullscreen READ gamescopeFullscreen WRITE setGamescopeFullscreen NOTIFY gamescopeFullscreenChanged)
Q_PROPERTY(bool gamescopeBorderless READ gamescopeBorderless WRITE setGamescopeBorderless NOTIFY gamescopeBorderlessChanged) Q_PROPERTY(bool gamescopeBorderless READ gamescopeBorderless WRITE setGamescopeBorderless NOTIFY gamescopeBorderlessChanged)
Q_PROPERTY(int gamescopeWidth READ gamescopeWidth WRITE setGamescopeWidth NOTIFY gamescopeWidthChanged) Q_PROPERTY(int gamescopeWidth READ gamescopeWidth WRITE setGamescopeWidth NOTIFY gamescopeWidthChanged)
@ -80,6 +81,8 @@ public:
[[nodiscard]] bool directx9Enabled() const; [[nodiscard]] bool directx9Enabled() const;
void setDirectX9Enabled(bool value); void setDirectX9Enabled(bool value);
[[nodiscard]] bool hasDirectx9() const;
[[nodiscard]] bool gamescopeFullscreen() const; [[nodiscard]] bool gamescopeFullscreen() const;
void setGamescopeFullscreen(bool value); void setGamescopeFullscreen(bool value);

2
launcher/src/gamerunner.cpp
View file

@ -23,7 +23,7 @@ GameRunner::GameRunner(LauncherCore &launcher, QObject *parent)
void GameRunner::beginGameExecutable(Profile &profile, const LoginAuth &auth) void GameRunner::beginGameExecutable(Profile &profile, const LoginAuth &auth)
{ {
QString gameExectuable; QString gameExectuable;
if (profile.directx9Enabled()) { if (profile.directx9Enabled() && profile.hasDirectx9()) {
gameExectuable = profile.gamePath() + QStringLiteral("/game/ffxiv.exe"); gameExectuable = profile.gamePath() + QStringLiteral("/game/ffxiv.exe");
} else { } else {
gameExectuable = profile.gamePath() + QStringLiteral("/game/ffxiv_dx11.exe"); gameExectuable = profile.gamePath() + QStringLiteral("/game/ffxiv_dx11.exe");

6
launcher/src/profile.cpp
View file

@ -239,6 +239,12 @@ void Profile::setDirectX9Enabled(const bool value)
} }
} }
bool Profile::hasDirectx9() const
{
const QDir gameDir(gamePath());
return QFileInfo::exists(gameDir.absoluteFilePath(QStringLiteral("game/ffxiv.exe")));
}
bool Profile::gamescopeFullscreen() const bool Profile::gamescopeFullscreen() const
{ {
return m_config->gamescopeFullscreen(); return m_config->gamescopeFullscreen();

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

@ -61,10 +61,12 @@ FormCard.FormCardPage {
model: ["DirectX 11", "DirectX 9"] model: ["DirectX 11", "DirectX 9"]
currentIndex: page.profile.directx9Enabled ? 1 : 0 currentIndex: page.profile.directx9Enabled ? 1 : 0
onCurrentIndexChanged: page.profile.directx9Enabled = (currentIndex === 1) onCurrentIndexChanged: page.profile.directx9Enabled = (currentIndex === 1)
visible: page.profile.hasDirectx9
} }
FormCard.FormDelegateSeparator { FormCard.FormDelegateSeparator {
above: directXDelegate above: directXDelegate
visible: page.profile.hasDirectx9
} }
FormCard.FormTextDelegate { FormCard.FormTextDelegate {