Merge branch 'develop' into develop

This commit is contained in:
Core 2022-02-17 00:23:52 +00:00 committed by GitHub
commit 5fa345e6c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 66 deletions

View file

@ -88,7 +88,7 @@ export class BrowserWindow {
y: undefined,
minWidth: 900,
minHeight: 390,
frame: false,
frame: (process.platform === "linux"),
title: "Cider",
vibrancy: "fullscreen-ui",
transparent: process.platform === "darwin",
@ -130,6 +130,7 @@ export class BrowserWindow {
this.startWebServer();
BrowserWindow.win = new bw(this.options);
BrowserWindow.win.setMenuBarVisibility(false)
const ws = new wsapi(BrowserWindow.win)
ws.InitWebSockets()
// and load the renderer.

View file

@ -9,7 +9,6 @@ export class Store {
"close_button_hide": false,
"open_on_startup": false,
"discord_rpc": 1, // 0 = disabled, 1 = enabled as Cider, 2 = enabled as Apple Music
"discord_rpc_clear_on_pause": true,
"language": "en_US", // electron.app.getLocale().replace('-', '_') this can be used in future
"playbackNotifications": true,
"update_branch": "main"