Skip to content

Commit 96f2f32

Browse files
authored
fix: the icon is incorrect on darwin (#797)
Co-authored-by: rick <[email protected]>
1 parent 8654864 commit 96f2f32

File tree

12 files changed

+775
-1526
lines changed

12 files changed

+775
-1526
lines changed
-2.91 KB
Binary file not shown.
-3.41 KB
Binary file not shown.
-10.8 KB
Binary file not shown.
55.5 KB
Binary file not shown.
216 KB
Binary file not shown.
32 KB
Loading

console/atest-desktop/forge.config.js

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,38 @@ limitations under the License.
1616

1717
const { FusesPlugin } = require('@electron-forge/plugin-fuses');
1818
const { FuseV1Options, FuseVersion } = require('@electron/fuses');
19-
const path = require('node:path');
2019

2120
module.exports = {
2221
packagerConfig: {
23-
icon: path.join(__dirname, 'api-testing.ico'),
22+
icon: './assets/icons/atest',
2423
asar: true
2524
},
2625
rebuildConfig: {},
2726
makers: [
2827
{
2928
name: '@electron-forge/maker-squirrel',
30-
config: {
31-
icon: 'api-testing.ico'
32-
},
29+
icon: './assets/icons/atest.ico'
3330
},
3431
{
3532
name: '@electron-forge/maker-deb',
36-
config: {
37-
options: {
38-
icon: 'api-testing.ico'
39-
}
40-
},
33+
icon: './assets/icons/atest.png'
4134
},
4235
{
4336
name: '@electron-forge/maker-rpm',
44-
config: {
45-
icon: 'api-testing.ico'
46-
},
37+
icon: './assets/icons/atest.png'
4738
},
4839
{
4940
name: '@electron-forge/maker-dmg',
50-
config: {
51-
icon: path.join(__dirname, 'api-testing.icns')
52-
}
41+
icon: './assets/icons/atest.icns',
42+
background: './assets/icons/atest.png',
43+
format: 'ULFO'
5344
},
5445
{
5546
name: '@electron-forge/maker-wix',
5647
config: {
5748
language: 1033,
5849
manufacturer: 'API Testing Authors',
59-
icon: 'api-testing.ico',
50+
icon: './assets/icons/atest.ico',
6051
ui: {
6152
"enabled": true,
6253
"chooseDirectory": true

console/atest-desktop/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ log.initialize();
3030
log.transports.file.level = getLogLevel()
3131
log.transports.file.resolvePathFn = () => server.getLogfile()
3232
if (process.platform === 'darwin') {
33-
app.dock.setIcon(path.join(__dirname, "api-testing.png"))
33+
app.dock.setIcon(path.join(__dirname, "assets/icons/atest.png"))
3434
}
3535

3636
const windowOptions = {

0 commit comments

Comments
 (0)