Merge branch 'main' into cut-release-v0.25.0

This commit is contained in:
Jess Frazelle
2024-09-03 12:11:50 -07:00
committed by GitHub

View File

@ -11,6 +11,7 @@ import * as kittycad from '@kittycad/lib/import'
import electronUpdater, { type AppUpdater } from 'electron-updater' import electronUpdater, { type AppUpdater } from 'electron-updater'
import minimist from 'minimist' import minimist from 'minimist'
import getCurrentProjectFile from 'lib/getCurrentProjectFile' import getCurrentProjectFile from 'lib/getCurrentProjectFile'
import os from 'node:os'
let mainWindow: BrowserWindow | null = null let mainWindow: BrowserWindow | null = null
@ -72,8 +73,8 @@ const createWindow = (): BrowserWindow => {
preload: path.join(__dirname, './preload.js'), preload: path.join(__dirname, './preload.js'),
}, },
icon: path.resolve(process.cwd(), 'assets', 'icon.png'), icon: path.resolve(process.cwd(), 'assets', 'icon.png'),
// frame: false, frame: os.platform() !== 'darwin',
// titleBarStyle: 'hiddenInset', titleBarStyle: 'hiddenInset',
}) })
// and load the index.html of the app. // and load the index.html of the app.