Merge pull request #42 from xXJSONDeruloXx/relocate-envsv0.6.6

Relocate envs

3 files changed, 26 insertions, 28 deletions

diff --git a/src/components/ConfigurationSection.tsx b/src/components/ConfigurationSection.tsx
index ad99c28..5afd8f6 100644
--- a/src/components/ConfigurationSection.tsx
+++ b/src/components/ConfigurationSection.tsx
@@ -98,14 +98,12 @@ export function ConfigurationSection({
       <PanelSectionRow>
         <DropdownItem
           label="Override Vulkan present mode"
-          description="Select a specific Vulkan presentation mode for better performance or compatibility (may cause crashes)"
+          description="Select a specific Vulkan presentation mode for better performance or compatibility (May cause crashes)"
           menuLabel="Select presentation mode"
-          selectedOption={config.experimental_present_mode}
+          selectedOption={config.experimental_present_mode || "fifo"}
           onChange={(value) => onConfigChange('experimental_present_mode', value.data)}
           rgOptions={[
-            { data: "", label: "Default" },
-            { data: "fifo", label: "FIFO" },
-            { data: "vsync", label: "VSync" },
+            { data: "fifo", label: "FIFO (VSync) - Default" },
             { data: "mailbox", label: "Mailbox" },
             { data: "immediate", label: "Immediate" }
           ]}
@@ -113,18 +111,6 @@ export function ConfigurationSection({
       </PanelSectionRow>
 
       <PanelSectionRow>
-        <SliderField
-          label={`FPS Limit${config.experimental_fps_limit > 0 ? ` (${config.experimental_fps_limit} FPS)` : ' (Off)'}`}
-          description="Base framerate cap for DirectX games, before frame multiplier (requires game re-launch)"
-          value={config.experimental_fps_limit}
-          min={0}
-          max={60}
-          step={1}
-          onChange={(value) => onConfigChange('experimental_fps_limit', value)}
-        />
-      </PanelSectionRow>
-
-      <PanelSectionRow>
         <div
           style={{
             fontSize: "14px",
@@ -136,14 +122,26 @@ export function ConfigurationSection({
             color: "white"
           }}
         >
-          Environment Variables (Requires Re-launch)
+          Environment Variables (Requires re-launch)
         </div>
       </PanelSectionRow>
 
       <PanelSectionRow>
+        <SliderField
+          label={`Base FPS Cap${config.dxvk_frame_rate > 0 ? ` (${config.dxvk_frame_rate} FPS)` : ' (Off)'}`}
+          description="Base framerate cap for DirectX games, before frame multiplier"
+          value={config.dxvk_frame_rate}
+          min={0}
+          max={60}
+          step={1}
+          onChange={(value) => onConfigChange('dxvk_frame_rate', value)}
+        />
+      </PanelSectionRow>
+
+      <PanelSectionRow>
         <ToggleField
           label="Enable WOW64 for 32-bit games"
-          description="Enables PROTON_USE_WOW64=1 for 32-bit games (use with ProtonGE to fix crashing)"
+          description="Enables PROTON_USE_WOW64=1 for 32-bit games (Use with ProtonGE to fix crashing)"
           checked={config.enable_wow64}
           onChange={(value) => onConfigChange('enable_wow64', value)}
         />
@@ -152,7 +150,7 @@ export function ConfigurationSection({
       <PanelSectionRow>
         <ToggleField
           label="Disable Steam Deck Mode"
-          description="Disables Steam Deck mode (unlocks hidden settings in some games)"
+          description="Disables Steam Deck mode (Unlocks hidden settings in some games)"
           checked={config.disable_steamdeck_mode}
           onChange={(value) => onConfigChange('disable_steamdeck_mode', value)}
         />
diff --git a/src/components/UsageInstructions.tsx b/src/components/UsageInstructions.tsx
index 5de1fcf..6025241 100644
--- a/src/components/UsageInstructions.tsx
+++ b/src/components/UsageInstructions.tsx
@@ -71,8 +71,8 @@ export function UsageInstructions({ config }: UsageInstructionsProps) {
 • Flow Scale: ${Math.round(config.flow_scale * 100)}%
 • Performance Mode: ${config.performance_mode ? "Yes" : "No"}
 • HDR Mode: ${config.hdr_mode ? "Yes" : "No"}
-• Present Mode: ${config.experimental_present_mode || "Default (FIFO)"}
-• FPS Limit: ${config.experimental_fps_limit > 0 ? `${config.experimental_fps_limit} FPS` : "Off"}`}
+• Present Mode: ${config.experimental_present_mode || "FIFO (VSync)"}
+• DXVK Frame Rate: ${config.dxvk_frame_rate > 0 ? `${config.dxvk_frame_rate} FPS` : "Off"}`}
         </div>
       </PanelSectionRow> */}
 
diff --git a/src/config/configSchema.ts b/src/config/configSchema.ts
index fa54336..03b1510 100644
--- a/src/config/configSchema.ts
+++ b/src/config/configSchema.ts
@@ -61,15 +61,15 @@ export const CONFIG_SCHEMA: Record<string, ConfigField> = {
   experimental_present_mode: {
     name: "experimental_present_mode",
     fieldType: ConfigFieldType.STRING,
-    default: "",
-    description: "experimental: override vulkan present mode (empty/fifo/vsync/mailbox/immediate)"
+    default: "fifo",
+    description: "experimental: override vulkan present mode (fifo/mailbox/immediate)"
   },
   
-  experimental_fps_limit: {
-    name: "experimental_fps_limit",
+  dxvk_frame_rate: {
+    name: "dxvk_frame_rate",
     fieldType: ConfigFieldType.INTEGER,
     default: 0,
-    description: "experimental: base framerate cap for dxvk games, before frame multiplier (0 = disabled)"
+    description: "Base framerate cap for DirectX games, before frame multiplier (0 = disabled, requires game re-launch)"
   },
   
   enable_wow64: {
@@ -95,7 +95,7 @@ export interface ConfigurationData {
   performance_mode: boolean;
   hdr_mode: boolean;
   experimental_present_mode: string;
-  experimental_fps_limit: number;
+  dxvk_frame_rate: number;
   enable_wow64: boolean;
   disable_steamdeck_mode: boolean;
 }