0
0
mirror of https://github.com/cucumber-sp/yandex-music-linux.git synced 2025-04-20 07:33:44 +03:00

Refact current patches

This commit is contained in:
Nikolay Bely 2025-02-07 10:47:54 +07:00
parent 306d335992
commit 7e5fcb0d2d
2 changed files with 20 additions and 13 deletions

View File

@ -13,3 +13,17 @@ diff --git a/main/config.js b/main/config.js
enableWebSecurity: true, enableWebSecurity: true,
enableAutoUpdate: true, enableAutoUpdate: true,
enableUpdateByProbability: true, enableUpdateByProbability: true,
diff --git a/main/lib/preload.js b/main/lib/preload.js
--- a/main/lib/preload.js
+++ b/main/lib/preload.js
@@ -9,6 +9,8 @@ const deviceInfo_js_1 = require("./deviceInfo.js");
const deviceInfo = (0, deviceInfo_js_1.getDeviceInfo)();
+const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0;
electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION));
electron_1.contextBridge.exposeInMainWorld('BRANCH', String(config_js_1.config.buildInfo.BRANCH));
electron_1.contextBridge.exposeInMainWorld('PLATFORM', deviceInfo.os);
electron_1.contextBridge.exposeInMainWorld('DEVICE_INFO', deviceInfo);
+electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools);
electron_1.contextBridge.exposeInMainWorld('desktopEvents', {

View File

@ -20,7 +20,7 @@ diff --git a/main/index.js b/main/index.js
diff --git a/main/lib/createWindow.js b/main/lib/createWindow.js diff --git a/main/lib/createWindow.js b/main/lib/createWindow.js
--- a/main/lib/createWindow.js --- a/main/lib/createWindow.js
+++ b/main/lib/createWindow.js +++ b/main/lib/createWindow.js
@@ -38,13 +38,13 @@ const toggleWindowState = (window) => { @@ -38,13 +38,14 @@ const toggleWindowState = (window) => {
(0, tray_js_1.updateTrayMenu)(window); (0, tray_js_1.updateTrayMenu)(window);
}; };
exports.toggleWindowState = toggleWindowState; exports.toggleWindowState = toggleWindowState;
@ -33,27 +33,20 @@ diff --git a/main/lib/createWindow.js b/main/lib/createWindow.js
center: true, center: true,
frame: withFrame, frame: withFrame,
- titleBarStyle: 'hidden', - titleBarStyle: 'hidden',
+ ...(customTitleBar ? { titleBarStyle: 'hidden'} : {}),
trafficLightPosition: { trafficLightPosition: {
x: 16, x: 16,
y: 10 y: 10
diff --git a/main/lib/preload.js b/main/lib/preload.js diff --git a/main/lib/preload.js b/main/lib/preload.js
--- a/main/lib/preload.js --- a/main/lib/preload.js
+++ b/main/lib/preload.js +++ b/main/lib/preload.js
@@ -7,10 +7,14 @@ const deviceInfo_js_1 = require("./deviceInfo.js"); @@ -10,2 +10,3 @@
const theme_js_1 = require("../types/theme.js"); const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0;
const hostnamePatterns_js_1 = require("../constants/hostnamePatterns.js");
const deviceInfo = (0, deviceInfo_js_1.getDeviceInfo)();
+const customTitleBar = process.env.CUSTOM_TITLE_BAR && process.env.CUSTOM_TITLE_BAR > 0; +const customTitleBar = process.env.CUSTOM_TITLE_BAR && process.env.CUSTOM_TITLE_BAR > 0;
+const devTools = process.env.DEV_TOOLS && process.env.DEV_TOOLS > 0;
electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION)); electron_1.contextBridge.exposeInMainWorld('VERSION', String(config_js_1.config.buildInfo.VERSION));
electron_1.contextBridge.exposeInMainWorld('BRANCH', String(config_js_1.config.buildInfo.BRANCH)); @@ -15,2 +16,3 @@
electron_1.contextBridge.exposeInMainWorld('PLATFORM', deviceInfo.os); electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools);
electron_1.contextBridge.exposeInMainWorld('DEVICE_INFO', deviceInfo);
+electron_1.contextBridge.exposeInMainWorld('CUSTOM_TITLE_BAR', customTitleBar); +electron_1.contextBridge.exposeInMainWorld('CUSTOM_TITLE_BAR', customTitleBar);
+electron_1.contextBridge.exposeInMainWorld('IS_DEVTOOLS_ENABLED', devTools);
electron_1.contextBridge.exposeInMainWorld('desktopEvents', { electron_1.contextBridge.exposeInMainWorld('desktopEvents', {
send(name, ...args) {
electron_1.ipcRenderer.send(name, ...args);