Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
Madara
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
Madara
Commits
238e0efa
Commit
238e0efa
authored
Sep 27, 2019
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
51acf130
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
index.js
src/main/index.js
+6
-2
forwardMsg.vue
src/renderer/components/team/forwardMsg.vue
+1
-1
No files found.
src/main/index.js
View file @
238e0efa
...
@@ -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
()
...
...
src/renderer/components/team/forwardMsg.vue
View file @
238e0efa
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment