neil/silverbullet
1
0
Fork 0
Code

Merge branch 'main' of github.com:silverbulletmd/silverbullet

Browse Source
This commit is contained in:
Zef Hemel 2023-01-14 18:51:04 +01:00
commit bd4e38fd4e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/instance.ts
View File

@ -1,5 +1,5 @@
import { ChildProcessWithoutNullStreams, spawn } from "node:child_process"; import { ChildProcessWithoutNullStreams, spawn } from "node:child_process";
import { app, BrowserWindow, dialog, Menu, MenuItem, shell } from "electron"; import { app, BrowserWindow, dialog, Menu, MenuItem, shell, nativeImage } from "electron";
import portfinder from "portfinder"; import portfinder from "portfinder";
import fetch from "node-fetch"; import fetch from "node-fetch";
import { existsSync } from "node:fs"; import { existsSync } from "node:fs";
@ -144,14 +144,16 @@ export function findInstanceByUrl(url: URL) {
let quitting = false; let quitting = false;
const icon = nativeImage.createFromPath(process.resourcesPath + "/logo.png");
export function newWindow(instance: Instance, windowState: WindowState) { export function newWindow(instance: Instance, windowState: WindowState) {
// Create the browser window. // Create the browser window.
console.log("Empty icon?", icon.isEmpty());
const window = new BrowserWindow({ const window = new BrowserWindow({
height: windowState.height, height: windowState.height,
width: windowState.width, width: windowState.width,
x: windowState.x, x: windowState.x,
y: windowState.y, y: windowState.y,
icon: process.resourcesPath + "/logo.png", icon,
webPreferences: { webPreferences: {
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY, preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
}, },