App icon: use a rounded square for our Windows/Linux app icon.

Author: agarny

build/README.md

@@ -1,14 +1,10 @@
-# OpenCOR icon
-
-The different icon files in this directory were created using `../src/renderer/src/assets/logo.svg`, which is based off the original VPH logo.
-
-- `icon.png`: this is a `1024x1024` pixel version of `../src/renderer/src/assets/logo.svg`.
-- `icon.ico`: this is an ICO file containing multiple resolutions of `icon.png`, created using the following command:
+- `icon.png` is a `1024x1024` pixel version of `../src/renderer/src/assets/logo.svg`.
+- `icon.ico` is an ICO file containing multiple resolutions of `../src/main/assets/icon.png`, created using the following command:
 
   ```bash
-  magick icon.png -define icon:auto-resize=16,24,32,40,48,64,128,256 icon.ico
+  magick ../src/main/assets/icon.png -define icon:auto-resize=16,24,32,40,48,64,128,256 icon.ico
   ```
-- `icon.icns`: this is an ICNS file containing multiple resolutions of `icon.png`, created using the following commands:
+- `icon.icns` is an ICNS file containing multiple resolutions of `icon.png`, created using the following commands:
 
   ```bash
   OUT=TEMP-$$.iconset

build/icon.ico

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "0.20251111.0",
+  "version": "0.20251112.0",
   "scripts": {
     "archive:web": "bun src/renderer/scripts/archive.web.js",
     "build": "electron-vite build",

package.json

@@ -3,12 +3,11 @@ import { autoUpdater, type ProgressInfo, type UpdateCheckResult } from 'electron
 import path from 'node:path';
 import process from 'node:process';
 
-import icon from '../../build/icon.png?asset';
-
 import type { ISettings } from '../renderer/src/common/common';
 import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY } from '../renderer/src/common/constants';
 import { isLinux, isMacOs, isPackaged, isWindows } from '../renderer/src/common/electron';
 
+import icon from './assets/icon.png?asset';
 import { ApplicationWindow } from './ApplicationWindow';
 import { electronConf, type IElectronConfState } from './index';
 import { enableDisableMainMenu, updateReopenMenu } from './MainMenu';

src/main/MainWindow.ts

@@ -0,0 +1,10 @@
+- `icon.png` is a rounded square version `../src/renderer/src/assets/logo.svg`, created using the following commands:
+
+  ```bash
+  MASK=mask-$$.png
+
+  magick -size 1024x1024 xc:none -draw "roundrectangle 0,0,1023,1023,192,192" $MASK
+  magick ../../../build/icon.png -alpha set $MASK -compose DstIn -composite icon.png
+
+  rm -f $MASK
+  ```

src/main/assets/README.md

@@ -94,7 +94,7 @@ if (isLinux()) {
   }
 
   fs.copyFileSync(
-    path.join(import.meta.dirname, '../../build/icon.png'),
+    path.join(import.meta.dirname, '../../src/main/assets/icon.png'),
     path.join(`${localShareOpencorFolder}/icon.png`)
   );
 

src/main/assets/icon.png

@@ -39,7 +39,7 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "0.20251111.0",
+  "version": "0.20251112.0",
   "scripts": {
     "build": "vite build",
     "build:lib": "vite build --config vite.lib.config.ts && cp index.d.ts dist/index.d.ts",

src/main/index.ts

@@ -0,0 +1 @@
+- `logo.svg` is based off the original VPH logo.