Settings: add configuration widget for DXVK_CONFIG env variable

RareDevs · Jan 15, 2025 · 7ff632f · 7ff632f
1 parent b33d456
commit 7ff632f
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 64 deletions.
diff --git a/rare/components/tabs/library/details/settings.py b/rare/components/tabs/library/details/settings.py
@@ -11,7 +11,7 @@
 from rare.components.tabs.settings.widgets.env_vars import EnvVars
 from rare.components.tabs.settings.widgets.game import GameSettingsBase
 from rare.components.tabs.settings.widgets.launch import LaunchSettingsBase
-from rare.components.tabs.settings.widgets.overlay import DxvkSettings
+from rare.components.tabs.settings.widgets.overlay import DxvkOverlaySettings, DxvkConfigSettings
 from rare.components.tabs.settings.widgets.wrappers import WrapperSettings
 from rare.models.game import RareGame
 from rare.utils import config_helper as config
@@ -157,10 +157,13 @@ def load_settings(self, app_name: str):
                 self.app_name = app_name
 
 
-class GameDxvkSettings(DxvkSettings):
+class GameDxvkOverlaySettings(DxvkOverlaySettings):
     def load_settings(self, app_name: str):
         self.app_name = app_name
 
+class GameDxvkConfigSettings(DxvkConfigSettings):
+    def load_settings(self, app_name: str):
+        self.app_name = app_name
 
 class GameEnvVars(EnvVars):
     def load_settings(self, app_name):
@@ -172,19 +175,30 @@ def __init__(self, parent=None):
         if pf.system() != "Windows":
             if pf.system() in {"Linux", "FreeBSD"}:
                 super(GameSettings, self).__init__(
-                    GameLaunchSettings, GameDxvkSettings, GameEnvVars,
-                    GameWineSettings, GameProtonSettings, GameMangoHudSettings,
+                    GameLaunchSettings,
+                    GameDxvkOverlaySettings,
+                    GameDxvkConfigSettings,
+                    GameEnvVars,
+                    GameWineSettings,
+                    GameProtonSettings,
+                    GameMangoHudSettings,
                     parent=parent
                 )
             else:
                 super(GameSettings, self).__init__(
-                    GameLaunchSettings, GameDxvkSettings, GameEnvVars,
+                    GameLaunchSettings,
+                    GameDxvkOverlaySettings,
+                    GameDxvkConfigSettings,
+                    GameEnvVars,
                     GameWineSettings,
                     parent=parent
                 )
         else:
             super(GameSettings, self).__init__(
-                GameLaunchSettings, GameDxvkSettings, GameEnvVars,
+                GameLaunchSettings,
+                GameDxvkOverlaySettings,
+                GameDxvkConfigSettings,
+                GameEnvVars,
                 parent=parent
             )
 
@@ -197,5 +211,6 @@ def load_settings(self, rgame: RareGame):
             if pf.system() in {"Linux", "FreeBSD"}:
                 self.proton_tool.load_settings(rgame.app_name)
                 self.mangohud.load_settings(rgame.app_name)
-        self.dxvk.load_settings(rgame.app_name)
+        self.dxvk_overlay.load_settings(rgame.app_name)
+        self.dxvk_config.load_settings(rgame.app_name)
         self.env_vars.load_settings(rgame.app_name)
diff --git a/rare/components/tabs/settings/settings.py b/rare/components/tabs/settings/settings.py
@@ -4,7 +4,7 @@
 from .widgets.env_vars import EnvVars
 from .widgets.game import GameSettingsBase
 from .widgets.launch import LaunchSettingsBase
-from .widgets.overlay import DxvkSettings
+from .widgets.overlay import DxvkOverlaySettings, DxvkConfigSettings
 from .widgets.wrappers import WrapperSettings
 
 if pf.system() != "Windows":
@@ -26,18 +26,29 @@ def __init__(self, parent=None):
         if pf.system() != "Windows":
             if pf.system() in {"Linux", "FreeBSD"}:
                 super(GameSettings, self).__init__(
-                    LaunchSettings, DxvkSettings, EnvVars,
-                    WineSettings, ProtonSettings, MangoHudSettings,
+                    LaunchSettings,
+                    DxvkOverlaySettings,
+                    DxvkConfigSettings,
+                    EnvVars,
+                    WineSettings,
+                    ProtonSettings,
+                    MangoHudSettings,
                     parent=parent
                 )
             else:
                 super(GameSettings, self).__init__(
-                    LaunchSettings, DxvkSettings, EnvVars,
+                    LaunchSettings,
+                    DxvkOverlaySettings,
+                    DxvkConfigSettings,
+                    EnvVars,
                     WineSettings,
                     parent=parent
                 )
         else:
             super(GameSettings, self).__init__(
-                LaunchSettings, DxvkSettings, EnvVars,
+                LaunchSettings,
+                DxvkOverlaySettings,
+                DxvkConfigSettings,
+                EnvVars,
                 parent=parent
             )
diff --git a/rare/components/tabs/settings/widgets/env_vars_model.py b/rare/components/tabs/settings/widgets/env_vars_model.py
@@ -30,6 +30,7 @@ def __init__(self, core: LegendaryCore, parent=None):
 
         self.__readonly = {
             "DXVK_HUD",
+            "DXVK_CONFIG",
             "MANGOHUD",
             "MANGOHUD_CONFIG",
         }

diff --git a/rare/components/tabs/settings/widgets/game.py b/rare/components/tabs/settings/widgets/game.py
@@ -18,7 +18,7 @@
 from rare.widgets.side_tab import SideTabContents
 from .env_vars import EnvVars
 from .launch import LaunchSettingsType
-from .overlay import DxvkSettings
+from .overlay import DxvkOverlaySettings, DxvkConfigSettings
 
 if pf.system() != "Windows":
     from .wine import WineSettings
@@ -33,7 +33,8 @@ class GameSettingsBase(QWidget, SideTabContents):
     def __init__(
         self,
         launch_widget: Type[LaunchSettingsType],
-        dxvk_widget: Type[DxvkSettings],
+        dxvk_hud_widget: Type[DxvkOverlaySettings],
+        dxvk_config_widget: Type[DxvkConfigSettings],
         envvar_widget: Type[EnvVars],
         wine_widget: Type['WineSettings'] = None,
         proton_widget: Type['ProtonSettings'] = None,
@@ -81,8 +82,11 @@ def __init__(
         #         lambda: self.compat_stack.setCurrentIndex(self.compat_combo.currentData(Qt.ItemDataRole.UserRole))
         #     )
 
-        self.dxvk = dxvk_widget(self)
-        self.dxvk.environ_changed.connect(self.env_vars.reset_model)
+        self.dxvk_overlay = dxvk_hud_widget(self)
+        self.dxvk_overlay.environ_changed.connect(self.env_vars.reset_model)
+
+        self.dxvk_config = dxvk_config_widget(self)
+        self.dxvk_config.environ_changed.connect(self.env_vars.reset_model)
 
         if pf.system() in {"Linux", "FreeBSD"}:
             self.mangohud = mangohud_widget(self)
@@ -92,7 +96,8 @@ def __init__(
         self.main_layout.addWidget(self.launch)
         if pf.system() != "Windows":
             self.main_layout.addWidget(self.compat)
-        self.main_layout.addWidget(self.dxvk)
+        self.main_layout.addWidget(self.dxvk_overlay)
+        self.main_layout.addWidget(self.dxvk_config)
         if pf.system() in {"Linux", "FreeBSD"}:
             self.main_layout.addWidget(self.mangohud)
         self.main_layout.addWidget(self.env_vars)