|
|
@@ -1,10 +1,22 @@
|
|
|
-const { app, BrowserWindow, BrowserView, Tray, Menu, nativeImage } = require('electron')
|
|
|
+const {
|
|
|
+ app,
|
|
|
+ BrowserWindow,
|
|
|
+ BrowserView,
|
|
|
+ Tray,
|
|
|
+ Menu,
|
|
|
+ nativeImage,
|
|
|
+ screen
|
|
|
+} = require('electron')
|
|
|
|
|
|
const { resolve } = require('path')
|
|
|
|
|
|
let tray
|
|
|
|
|
|
function createWindow () {
|
|
|
+ const mainScreen = screen.getPrimaryDisplay()
|
|
|
+
|
|
|
+ const menuBarHeight = mainScreen.workArea.y
|
|
|
+
|
|
|
const mainWindow = new BrowserWindow({
|
|
|
width: 1000,
|
|
|
height: 600, // 设置打开的窗口大小
|
|
|
@@ -12,6 +24,7 @@ function createWindow () {
|
|
|
enableLargerThanScreen: true,
|
|
|
autoHideMenuBar: true,
|
|
|
icon: 'logo.png',
|
|
|
+ frame: true, // 显示mac 上顶部的状态栏
|
|
|
webPreferences: {
|
|
|
// contextIsolation: false,
|
|
|
// worldSafeExecuteJavaScript:a flse,
|
|
|
@@ -33,6 +46,12 @@ function createWindow () {
|
|
|
view.setAutoResize({ width: true, height: true })
|
|
|
view.useContentSize = true
|
|
|
|
|
|
+ // 解决mac 顶部的菜单栏高度显示问题
|
|
|
+ // const marginTopDiv = document.createElement('div')
|
|
|
+ // marginTopDiv.style.height = `${menuBarHeight}px`
|
|
|
+ // marginTopDiv.style.width = '100%'
|
|
|
+ // document.body.appendChild(marginTopDiv)
|
|
|
+
|
|
|
view.webContents.loadURL('http://cloudlink.jiaolongcloud.com') // wiew载入的页面
|
|
|
}
|
|
|
|