[Fix] 2.5.0 Beta 1 Fixes (#1979)

* fix: library item always selected * chore: refresh library only if library is empty * Fix Heroic does not respect launch arguments on custom added windows games (v2.5.0beta1) #1977 * fix: uninstalled recent games shown as installed * fix: spacing on settings * fix: broken gamepad * fix: wine settings on windows * fix: game settings route * fix: enable language setting on default settings * fix: pr comments
Heroic-Games-Launcher · Nov 3, 2022 · 1a23c3c · 1a23c3c
1 parent cbd237a
commit 1a23c3c
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 59 deletions.
diff --git a/src/backend/api/misc.ts b/src/backend/api/misc.ts
@@ -41,7 +41,7 @@ export const refreshLibrary = async (
 ) => ipcRenderer.invoke('refreshLibrary', fullRefresh, library)
 
 export const gamepadAction = async (
-  args: [action: string, metadata: { elementTag: string; x: number; y: number }]
+  args: [action: string, metadata: unknown]
 ) => ipcRenderer.invoke('gamepadAction', args)
 
 export const logError = (error: string) => ipcRenderer.send('logError', error)

diff --git a/src/backend/sideload/games.ts b/src/backend/sideload/games.ts
@@ -107,8 +107,10 @@ export async function launchApp(appName: string): Promise<boolean> {
     folder_name
   } = gameInfo
 
+  const gameSettings = await getAppSettings(appName)
+  const { launcherArgs } = gameSettings
+
   if (executable) {
-    const gameSettings = await getAppSettings(appName)
     const {
       success: launchPrepSuccess,
       failureReason: launchPrepFailReason,
@@ -143,7 +145,6 @@ export async function launchApp(appName: string): Promise<boolean> {
 
     // Native
     if (isNativeApp(appName)) {
-      const { launcherArgs } = gameSettings
       logInfo(
         `launching native sideloaded: ${executable} ${launcherArgs ?? ''}`,
         { prefix: LogPrefix.Backend }
@@ -187,7 +188,7 @@ export async function launchApp(appName: string): Promise<boolean> {
     })
 
     await runWineCommand({
-      commandParts: [executable],
+      commandParts: [executable, launcherArgs ?? ''],
       gameSettings,
       wait: false,
       startFolder: folder_name,

diff --git a/src/frontend/App.tsx b/src/frontend/App.tsx
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react'
 
 import './App.css'
-import { HashRouter, Route, Routes } from 'react-router-dom'
+import { HashRouter, Navigate, Route, Routes } from 'react-router-dom'
 import Login from './screens/Login'
 import WebView from './screens/WebView'
 import { GamePage } from './screens/Game'
@@ -27,12 +27,13 @@ function App() {
         <main className="content">
           <DialogHandler />
           <Routes>
-            <Route path="/" element={<Library />} />
+            <Route path="/" element={<Navigate replace to="/library" />} />
+            <Route path="/library" element={<Library />} />
             <Route path="login" element={<Login />} />
             <Route path="epicstore" element={<WebView />} />
             <Route path="gogstore" element={<WebView />} />
             <Route path="wiki" element={<WebView />} />
-            <Route path="gamepage">
+            <Route path="/gamepage">
               <Route path=":runner">
                 <Route path=":appName" element={<GamePage />} />
               </Route>

diff --git a/src/frontend/components/UI/Sidebar/components/SidebarLinks/index.tsx b/src/frontend/components/UI/Sidebar/components/SidebarLinks/index.tsx
@@ -71,12 +71,7 @@ export default function SidebarLinks() {
         setGameInfo(info)
         if (info?.is_installed) {
           setIsDefaultSetting(false)
-          const isNative = await window.api.isNative({ appName, runner })
-          // setIsNativeApp(isNative)
-          const wineOrOther = isNative
-            ? `/settings/${runner}/${appName}/other`
-            : `/settings/${runner}/${appName}/games_settings`
-          setSettingsPath(wineOrOther)
+          setSettingsPath(`/settings/${runner}/${appName}/games_settings`)
         }
       }
     }
@@ -93,6 +88,18 @@ export default function SidebarLinks() {
     }
   }, [location])
 
+  async function handleRefresh() {
+    localStorage.setItem('scrollPosition', '0')
+
+    const shouldRefresh =
+      (epic.username && !epic.library.length) ||
+      (gog.username && !gog.library.length)
+    if (shouldRefresh) {
+      return refreshLibrary({ runInBackground: true, fullRefresh: true })
+    }
+    return
+  }
+
   return (
     <div className="SidebarLinks Sidebar__section">
       {!loggedIn && (
@@ -117,11 +124,8 @@ export default function SidebarLinks() {
         className={({ isActive }) =>
           classNames('Sidebar__item', { active: isActive })
         }
-        to={'/'}
-        onClick={() => {
-          localStorage.setItem('scrollPosition', '0')
-          refreshLibrary({ runInBackground: false, fullRefresh: true })
-        }}
+        to={'/library'}
+        onClick={async () => handleRefresh()}
       >
         <>
           <div className="Sidebar__itemIcon">

diff --git a/src/frontend/helpers/gamepad.ts b/src/frontend/helpers/gamepad.ts
@@ -166,8 +166,7 @@ export const initGamepad = () => {
       } else {
         // we have to tell Electron to simulate key presses
         // so the spatial navigation works
-        const metadataReturn = metadata()
-        if (metadataReturn) window.api.gamepadAction([action, metadataReturn])
+        window.api.gamepadAction([action, metadata()])
       }
     }
   }

diff --git a/src/frontend/screens/Game/GamePage/index.tsx b/src/frontend/screens/Game/GamePage/index.tsx
@@ -224,9 +224,7 @@ export default function GamePage(): JSX.Element | null {
     const isMacNative = isMac.includes(installPlatform ?? '')
     const isLinuxNative = installPlatform === 'linux'
     const isNative = isWin || isMacNative || isLinuxNative
-    const pathname = isNative
-      ? `/settings/${runner}/${appName}/other`
-      : `/settings/${runner}/${appName}/games_settings`
+    const pathname = `/settings/${runner}/${appName}/games_settings`
 
     const showCloudSaveInfo = cloud_save_enabled && !isLinuxNative
     /*

diff --git a/src/frontend/screens/Library/components/GameCard/index.tsx b/src/frontend/screens/Library/components/GameCard/index.tsx
@@ -77,15 +77,12 @@ const GameCard = ({
     libraryStatus,
     layout,
     handleGameStatus,
-    platform,
     hiddenGames,
     favouriteGames,
     allTilesInColor,
     showDialogModal
   } = useContext(ContextProvider)
 
-  const isWin = platform === 'win32'
-
   const grid = forceCard || layout === 'grid'
 
   const { status, folder } =
@@ -244,10 +241,7 @@ const GameCard = ({
   const isMac = ['osx', 'Mac']
   const isMacNative = isMac.includes(installedPlatform ?? '')
   const isLinuxNative = installedPlatform === 'linux'
-  const isNative = isWin || isMacNative || isLinuxNative
-  const pathname = isNative
-    ? `/settings/${runner}/${appName}/other`
-    : `/settings/${runner}/${appName}/games_settings`
+  const pathname = `/settings/${runner}/${appName}/games_settings`
 
   const onUninstallClick = function () {
     setShowUninstallModal(true)
@@ -327,7 +321,7 @@ const GameCard = ({
         <div className={wrapperClasses}>
           {haveStatus && <span className="progress">{getStatus()}</span>}
           <Link
-            to={`gamepage/${runner}/${appName}`}
+            to={`/gamepage/${runner}/${appName}`}
             style={
               { '--installing-effect': installingGrayscale } as CSSProperties
             }

diff --git a/src/frontend/screens/Library/components/RecentlyPlayed/index.tsx b/src/frontend/screens/Library/components/RecentlyPlayed/index.tsx
@@ -59,7 +59,7 @@ export default function RecentlyPlayed({ handleModal, onlyInstalled }: Props) {
     return () => {
       recentGamesChangedRemoveListener()
     }
-  }, [])
+  }, [epic.library, gog.library, sideloadedLibrary])
 
   if (!recentGames.length) {
     return null

diff --git a/src/frontend/screens/Settings/components/BattlEyeRuntime.tsx b/src/frontend/screens/Settings/components/BattlEyeRuntime.tsx
@@ -31,7 +31,7 @@ const BattlEyeRuntime = () => {
   }
 
   return (
-    <>
+    <div className="toggleRow">
       <ToggleSwitch
         htmlId="battlEyeRuntime"
         value={battlEyeRuntime}
@@ -47,7 +47,7 @@ const BattlEyeRuntime = () => {
           )}
         </span>
       )}
-    </>
+    </div>
   )
 }
 

diff --git a/src/frontend/screens/Settings/components/EacRuntime.tsx b/src/frontend/screens/Settings/components/EacRuntime.tsx
@@ -51,7 +51,7 @@ const EacRuntime = () => {
     setEacRuntime(!eacRuntime)
   }
   return (
-    <>
+    <div className="toggleRow">
       <ToggleSwitch
         htmlId="eacRuntime"
         value={eacRuntime}
@@ -64,7 +64,7 @@ const EacRuntime = () => {
           {t('settings.eacRuntime.installing', 'Installing EAC Runtime...')}
         </span>
       )}
-    </>
+    </div>
   )
 }
 

diff --git a/src/frontend/screens/Settings/components/PreferedLanguage.tsx b/src/frontend/screens/Settings/components/PreferedLanguage.tsx
@@ -1,21 +1,15 @@
-import React, { ChangeEvent, useContext } from 'react'
+import React, { ChangeEvent } from 'react'
 import { useTranslation } from 'react-i18next'
 import { InfoBox, TextInputField } from 'frontend/components/UI'
 import useSetting from 'frontend/hooks/useSetting'
-import SettingsContext from '../SettingsContext'
 
 const PreferedLanguage = () => {
   const { t } = useTranslation()
-  const { isDefault } = useContext(SettingsContext)
   const [languageCode, setLanguageCode] = useSetting('language', '')
 
   const handleLanguageCode = (event: ChangeEvent<HTMLInputElement>) =>
     setLanguageCode(event.currentTarget.value)
 
-  if (isDefault) {
-    return <></>
-  }
-
   const languageInfo = (
     <InfoBox text="infobox.help">
       {t(

diff --git a/src/frontend/screens/Settings/sections/GamesSettings/index.scss b/src/frontend/screens/Settings/sections/GamesSettings/index.scss
@@ -21,5 +21,6 @@
 
   section:not(:nth-of-type(0)) {
     padding-top: var(--space-xl);
+    min-width: 500px;
   }
 }
diff --git a/src/frontend/screens/Settings/sections/GamesSettings/index.tsx b/src/frontend/screens/Settings/sections/GamesSettings/index.tsx
@@ -39,6 +39,7 @@ export default function GamesSettings() {
   const { platform } = useContext(ContextProvider)
   const { isDefault } = useContext(SettingsContext)
   const isLinux = platform === 'linux'
+  const isWin = platform === 'win32'
 
   return (
     <>
@@ -52,31 +53,37 @@ export default function GamesSettings() {
         </p>
       )}
 
-      <section>
-        <h3 className="settingSubheader">{isLinux ? 'Wine' : 'Crossover'}</h3>
+      {!isWin && (
+        <>
+          <section>
+            <h3 className="settingSubheader">
+              {isLinux ? 'Wine' : 'Crossover'}
+            </h3>
 
-        <WinePrefix />
+            <WinePrefix />
 
-        <WineVersionSelector />
+            <WineVersionSelector />
 
-        <CrossoverBottle />
+            <CrossoverBottle />
 
-        <Tools />
-      </section>
+            <Tools />
+          </section>
 
-      <section>
-        <h3 className="settingSubheader">
-          {t('settings.navbar.wineExt', 'Wine Extensions')}
-        </h3>
+          <section>
+            <h3 className="settingSubheader">
+              {t('settings.navbar.wineExt', 'Wine Extensions')}
+            </h3>
 
-        <AutoDXVK />
+            <AutoDXVK />
 
-        <AutoVKD3D />
+            <AutoVKD3D />
 
-        <EacRuntime />
+            <EacRuntime />
 
-        <BattlEyeRuntime />
-      </section>
+            <BattlEyeRuntime />
+          </section>
+        </>
+      )}
 
       <section>
         <h3 className="settingSubheader">{t('settings.navbar.other')}</h3>