Merge pull request #32 from Proryanator-Forks/fix/splash-icon-update

Updated icons, fixed splash screen aspect ratio and gif playback
FLock-io · Sep 5, 2023 · 31bdd41 · 31bdd41
2 parents d70cf83 + 52a23e5
commit 31bdd41
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,6 +4,7 @@
 *.jpg   binary
 *.jpeg  binary
 *.ico   binary
+*.gif   binary
 *.icns  binary
 *.eot   binary
 *.otf   binary

diff --git a/assets/icon.icns b/assets/icon.icns
diff --git a/assets/icon.ico b/assets/icon.ico
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/splash/splash.gif b/splash/splash.gif
diff --git a/splash/splash.html b/splash/splash.html
@@ -5,8 +5,8 @@
 </head>
 
 <body>
-  <img width="600" height="420" src="./splash.gif" />
+  <img width="600" height="338" src="./splash.gif" />
 </body>
 
 
-</html>
+</html>
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -19,12 +19,21 @@ import fs from 'fs';
 import MenuBuilder from './menu';
 import { resolveHtmlPath } from './util';
 import { execPath } from './binaries';
+import { platform } from 'os';
 
 const pinata = new Pinata(
   '9db9fffc88c7e281b5b2',
   '5c761fe42f8267832f70a1f00430d9f3d9006fc9624e5bce43a44b7edd79f624'
 );
 
+function getIcon() {
+  if (process.platform === 'darwin') {
+    return 'icon.icns';
+  }
+
+  return 'icon.png';
+}
+
 class AppUpdater {
   constructor() {
     log.transports.file.level = 'info';
@@ -161,11 +170,12 @@ const createWindow = async () => {
     show: false,
     width: 1920,
     height: 1080,
-    icon: getAssetPath('icon.png'),
+    icon: getAssetPath(getIcon()),
     webPreferences: {
       preload: app.isPackaged
         ? path.join(__dirname, 'preload.js')
         : path.join(__dirname, '../../.erb/dll/preload.js'),
+      devTools: false,
     },
   });
 
@@ -176,9 +186,12 @@ const createWindow = async () => {
     height: 420,
     movable: true,
     center: true,
-    icon: getAssetPath('icon.png'),
+    icon: getAssetPath(getIcon()),
     transparent: true,
     frame: false,
+    webPreferences: {
+      devTools: false,
+    },
   });
 
   const splashScreenSrc = app.isPackaged
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,8 @@ @@
     </head>
     <body>
-      <img width="600" height="420" src="./splash.gif" />
+      <img width="600" height="338" src="./splash.gif" />
     </body>
-    </html>
+    </html>