Alert + Win600

EmuDeck · Jul 31, 2022 · 53c6dd7 · 53c6dd7
1 parent 97fb9cd
commit 53c6dd7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -118,13 +118,18 @@ const createWindow = async () => {
     return path.join(RESOURCES_PATH, ...paths);
   };
 
+  const { screen } = require('electron')
+  const primaryDisplay = screen.getPrimaryDisplay()
+  const { width, height } = primaryDisplay.workAreaSize
+  const screenHeight = height < 601 ? 600 : 720;
+  const isFullscreen = height < 601 ? true : false;
   mainWindow = new BrowserWindow({
     show: false,
     width: 1280,
-    height: 600,
+    height: screenHeight,
     icon: getAssetPath('icon.png'),
-    resizable: true,
-    fullscreen: false,
+    resizable: false,
+    fullscreen: isFullscreen,
     autoHideMenuBar: true,
     webPreferences: {
       preload: app.isPackaged
@@ -180,6 +185,8 @@ app
   .whenReady()
   .then(() => {
     createWindow();
+
+
     app.on('activate', () => {
       // On macOS it's common to re-create a window in the app when the
       // dock icon is clicked and there are no other windows open.

diff --git a/src/renderer/components b/src/renderer/components
diff --git a/src/renderer/pages/WelcomePage.js b/src/renderer/pages/WelcomePage.js
@@ -81,7 +81,7 @@ const WelcomePage = () => {
 
   return (
     <Welcome
-      data={data}
+      alert="This version of EmuDeck comes with a mayor update of the PS2 Emulator, please update your PS2 games using Steam Rom Manager at the end of this installation."
       disabledNext={second ? false : disabledNext}
       disabledBack={disabledBack}
       downloadComplete={downloadComplete}
+1 −1		molecules/Alert/alert.scss
+2 −0		molecules/Card/card.scss
+1 −1		organisms/Wrappers/PegasusTheme.js
+14 −1		organisms/Wrappers/Welcome.js