Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zkeyoung/Easy-Share
Browse files Browse the repository at this point in the history
  • Loading branch information
zkeyoung committed Mar 9, 2023
2 parents 1b80629 + fecac94 commit bbf2888
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 0 additions & 1 deletion forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module.exports = {
"LICENSE",
".gitignore",
".vscode",
"^/static"
],
icon: 'static/logo'
},
Expand Down
11 changes: 8 additions & 3 deletions src/window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@ function createWindow() {
const cachedWindow = getWindow();
if (cachedWindow) return resolve(cachedWindow);

const window = new BrowserWindow({
const bwOption: Electron.BrowserWindowConstructorOptions = {
height: 300,
width: 280,
resizable: false,
webPreferences: {
preload: path.resolve(__dirname, './preload.js'),
}
});
},
}
if (process.platform === 'win32') {
bwOption.height = 320;
bwOption.icon = path.resolve(__dirname, '../static/logo.ico');
}
const window = new BrowserWindow(bwOption);
window.loadFile(pagePath, { hash: cache.get(CacheKey.SETTINGS) ? '' : '#/settings' });
// window.loadURL('http://localhost:5173/');
window.once('ready-to-show', () => {
Expand Down
Binary file added static/logo.ico
Binary file not shown.

0 comments on commit bbf2888

Please sign in to comment.