Commit 238e0efa authored by 罗超's avatar 罗超

1

parent 51acf130
...@@ -781,6 +781,7 @@ let getLoginWindow = function() { ...@@ -781,6 +781,7 @@ let getLoginWindow = function() {
}) })
} }
let getMainWinodw = function(isLoad) { let getMainWinodw = function(isLoad) {
if (!mainWindow || mainWindow.isDestroyed()) { if (!mainWindow || mainWindow.isDestroyed()) {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
transparent: systemPreferences.isAeroGlassEnabled(), transparent: systemPreferences.isAeroGlassEnabled(),
...@@ -799,6 +800,7 @@ let getMainWinodw = function(isLoad) { ...@@ -799,6 +800,7 @@ let getMainWinodw = function(isLoad) {
mainWindow.hide() mainWindow.hide()
e.preventDefault() e.preventDefault()
}) })
} }
if (isLoad == 0) { if (isLoad == 0) {
mainWindow.loadURL(mainUrl) mainWindow.loadURL(mainUrl)
...@@ -806,7 +808,7 @@ let getMainWinodw = function(isLoad) { ...@@ -806,7 +808,7 @@ let getMainWinodw = function(isLoad) {
mainWindow.show() mainWindow.show()
mainWindow.setAlwaysOnTop(true) mainWindow.setAlwaysOnTop(true)
mainWindow.setAlwaysOnTop(false) mainWindow.setAlwaysOnTop(false)
mainWindow.webContents.openDevTools(true);
//getNoticeWindows() //getNoticeWindows()
}) })
} }
...@@ -955,12 +957,14 @@ let getAddNewUserWinodes = function() { ...@@ -955,12 +957,14 @@ let getAddNewUserWinodes = function() {
width: 500, width: 500,
height: 430, height: 430,
skipTaskbar: true, skipTaskbar: true,
alwaysOnTop: true alwaysOnTop: true,
webPreferences: { webSecurity: false }
}) })
addNewUserWinodes.loadURL(addnewuserUrl) addNewUserWinodes.loadURL(addnewuserUrl)
addNewUserWinodes.setMenu(null) addNewUserWinodes.setMenu(null)
addNewUserWinodes.once('ready-to-show', () => { addNewUserWinodes.once('ready-to-show', () => {
addNewUserWinodes.show() addNewUserWinodes.show()
addNewUserWinodes.webContents.openDevTools(true);
}) })
} else { } else {
addNewUserWinodes.focus() addNewUserWinodes.focus()
......
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
top: 0px; top: 0px;
right: 0px; right: 0px;
text-align: right; text-align: right;
height: 24px !important;
} }
.forward-msg .split { .forward-msg .split {
position: absolute; position: absolute;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment