From 848ab8d36b324cb5134336e066a02010a4abd3d9 Mon Sep 17 00:00:00 2001
From: Redromnon <rishimoharir@gmail.com>
Date: Thu, 14 Jul 2022 08:56:05 +0530
Subject: [PATCH 1/3] [Fix] System Libs Helper icon spacing

---
 src/screens/Settings/components/WineSettings/index.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/screens/Settings/components/WineSettings/index.tsx b/src/screens/Settings/components/WineSettings/index.tsx
index 0f1d867ca0..3f1af5c05d 100644
--- a/src/screens/Settings/components/WineSettings/index.tsx
+++ b/src/screens/Settings/components/WineSettings/index.tsx
@@ -366,7 +366,11 @@ export default function WineSettings({
               )}
             />
           </div>
+        </div>
+      )}
 
+      {isLinux && !isProton && (
+        <div>
           <div className="toggleRow">
             <ToggleSwitch
               htmlId="systemLibsToggle"

From 7fc122ed6be93363fa291a54803c02800c584dc5 Mon Sep 17 00:00:00 2001
From: Redromnon <rishimoharir@gmail.com>
Date: Thu, 14 Jul 2022 16:08:01 +0530
Subject: [PATCH 2/3] Use <> instead of another check

---
 .../components/WineSettings/index.tsx         | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/src/screens/Settings/components/WineSettings/index.tsx b/src/screens/Settings/components/WineSettings/index.tsx
index 3f1af5c05d..83e485910d 100644
--- a/src/screens/Settings/components/WineSettings/index.tsx
+++ b/src/screens/Settings/components/WineSettings/index.tsx
@@ -338,57 +338,57 @@ export default function WineSettings({
       )}
 
       {isLinux && !isProton && (
-        <div>
-          <div className="toggleRow">
-            <ToggleSwitch
-              htmlId="autovkd3d"
-              value={autoInstallVkd3d}
-              handleChange={() => {
-                const action = autoInstallVkd3d ? 'restore' : 'backup'
-                ipcRenderer.send('toggleVKD3D', [
-                  { winePrefix, winePath: wineVersion.bin },
-                  action
-                ])
-                return toggleAutoInstallVkd3d()
-              }}
-              title={t(
-                'setting.autovkd3d',
-                'Auto Install/Update VKD3D on Prefix'
-              )}
-            />
-
-            <FontAwesomeIcon
-              className="helpIcon"
-              icon={faCircleInfo}
-              title={t(
-                'help.vkd3d',
-                'VKD3D is a Vulkan-based translational layer for DirectX 12 games. Enabling may improve compatibility significantly. Has no effect on older DirectX games.'
-              )}
-            />
+        <>
+          <div>
+            <div className="toggleRow">
+              <ToggleSwitch
+                htmlId="autovkd3d"
+                value={autoInstallVkd3d}
+                handleChange={() => {
+                  const action = autoInstallVkd3d ? 'restore' : 'backup'
+                  ipcRenderer.send('toggleVKD3D', [
+                    { winePrefix, winePath: wineVersion.bin },
+                    action
+                  ])
+                  return toggleAutoInstallVkd3d()
+                }}
+                title={t(
+                  'setting.autovkd3d',
+                  'Auto Install/Update VKD3D on Prefix'
+                )}
+              />
+
+              <FontAwesomeIcon
+                className="helpIcon"
+                icon={faCircleInfo}
+                title={t(
+                  'help.vkd3d',
+                  'VKD3D is a Vulkan-based translational layer for DirectX 12 games. Enabling may improve compatibility significantly. Has no effect on older DirectX games.'
+                )}
+              />
+            </div>
           </div>
-        </div>
-      )}
-
-      {isLinux && !isProton && (
-        <div>
-          <div className="toggleRow">
-            <ToggleSwitch
-              htmlId="systemLibsToggle"
-              value={preferSystemLibs || false}
-              handleChange={togglePreferSystemLibs}
-              title={t('setting.preferSystemLibs', 'Prefer system libraries')}
-            />
 
-            <FontAwesomeIcon
-              className="helpIcon"
-              icon={faCircleInfo}
-              title={t(
-                'help.preferSystemLibs',
-                'Custom Wine versions (Wine-GE, Wine-Lutris) are shipped with their library dependencies. By enabling this option, these shipped libraries will be ignored and Wine will load system libraries instead. Warning! Issues may occur if dependencies are not met.'
-              )}
-            />
+          <div>
+            <div className="toggleRow">
+              <ToggleSwitch
+                htmlId="systemLibsToggle"
+                value={preferSystemLibs || false}
+                handleChange={togglePreferSystemLibs}
+                title={t('setting.preferSystemLibs', 'Prefer system libraries')}
+              />
+
+              <FontAwesomeIcon
+                className="helpIcon"
+                icon={faCircleInfo}
+                title={t(
+                  'help.preferSystemLibs',
+                  'Custom Wine versions (Wine-GE, Wine-Lutris) are shipped with their library dependencies. By enabling this option, these shipped libraries will be ignored and Wine will load system libraries instead. Warning! Issues may occur if dependencies are not met.'
+                )}
+              />
+            </div>
           </div>
-        </div>
+        </>
       )}
 
       <div className="toggleRow">

From 907de135161895afaadf48a804c61856842f7dfb Mon Sep 17 00:00:00 2001
From: Redromnon <rishimoharir@gmail.com>
Date: Thu, 14 Jul 2022 16:18:10 +0530
Subject: [PATCH 3/3] Remove extra <div>

---
 .../components/WineSettings/index.tsx         | 88 +++++++++----------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/src/screens/Settings/components/WineSettings/index.tsx b/src/screens/Settings/components/WineSettings/index.tsx
index 83e485910d..c71d00a6df 100644
--- a/src/screens/Settings/components/WineSettings/index.tsx
+++ b/src/screens/Settings/components/WineSettings/index.tsx
@@ -339,54 +339,50 @@ export default function WineSettings({
 
       {isLinux && !isProton && (
         <>
-          <div>
-            <div className="toggleRow">
-              <ToggleSwitch
-                htmlId="autovkd3d"
-                value={autoInstallVkd3d}
-                handleChange={() => {
-                  const action = autoInstallVkd3d ? 'restore' : 'backup'
-                  ipcRenderer.send('toggleVKD3D', [
-                    { winePrefix, winePath: wineVersion.bin },
-                    action
-                  ])
-                  return toggleAutoInstallVkd3d()
-                }}
-                title={t(
-                  'setting.autovkd3d',
-                  'Auto Install/Update VKD3D on Prefix'
-                )}
-              />
-
-              <FontAwesomeIcon
-                className="helpIcon"
-                icon={faCircleInfo}
-                title={t(
-                  'help.vkd3d',
-                  'VKD3D is a Vulkan-based translational layer for DirectX 12 games. Enabling may improve compatibility significantly. Has no effect on older DirectX games.'
-                )}
-              />
-            </div>
+          <div className="toggleRow">
+            <ToggleSwitch
+              htmlId="autovkd3d"
+              value={autoInstallVkd3d}
+              handleChange={() => {
+                const action = autoInstallVkd3d ? 'restore' : 'backup'
+                ipcRenderer.send('toggleVKD3D', [
+                  { winePrefix, winePath: wineVersion.bin },
+                  action
+                ])
+                return toggleAutoInstallVkd3d()
+              }}
+              title={t(
+                'setting.autovkd3d',
+                'Auto Install/Update VKD3D on Prefix'
+              )}
+            />
+
+            <FontAwesomeIcon
+              className="helpIcon"
+              icon={faCircleInfo}
+              title={t(
+                'help.vkd3d',
+                'VKD3D is a Vulkan-based translational layer for DirectX 12 games. Enabling may improve compatibility significantly. Has no effect on older DirectX games.'
+              )}
+            />
           </div>
 
-          <div>
-            <div className="toggleRow">
-              <ToggleSwitch
-                htmlId="systemLibsToggle"
-                value={preferSystemLibs || false}
-                handleChange={togglePreferSystemLibs}
-                title={t('setting.preferSystemLibs', 'Prefer system libraries')}
-              />
-
-              <FontAwesomeIcon
-                className="helpIcon"
-                icon={faCircleInfo}
-                title={t(
-                  'help.preferSystemLibs',
-                  'Custom Wine versions (Wine-GE, Wine-Lutris) are shipped with their library dependencies. By enabling this option, these shipped libraries will be ignored and Wine will load system libraries instead. Warning! Issues may occur if dependencies are not met.'
-                )}
-              />
-            </div>
+          <div className="toggleRow">
+            <ToggleSwitch
+              htmlId="systemLibsToggle"
+              value={preferSystemLibs || false}
+              handleChange={togglePreferSystemLibs}
+              title={t('setting.preferSystemLibs', 'Prefer system libraries')}
+            />
+
+            <FontAwesomeIcon
+              className="helpIcon"
+              icon={faCircleInfo}
+              title={t(
+                'help.preferSystemLibs',
+                'Custom Wine versions (Wine-GE, Wine-Lutris) are shipped with their library dependencies. By enabling this option, these shipped libraries will be ignored and Wine will load system libraries instead. Warning! Issues may occur if dependencies are not met.'
+              )}
+            />
           </div>
         </>
       )}