marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
Conversation 0 Commits 99 Files Changed 34 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 225a8c8e71 - Show all commits

1
main.js
View File

@ -317,6 +317,7 @@ app.on('ready', () => {
childWindow[config.key] = child childWindow[config.key] = child
child.once('ready-to-show', () => { child.once('ready-to-show', () => {
childWindow[config.key].show() childWindow[config.key].show()
childWindow[config.key].setAlwaysOnTop(true)
windowOperation(config) windowOperation(config)
}) })
child.webContents.on('before-input-event', (event, input) => { child.webContents.on('before-input-event', (event, input) => {

4
src/page/Meeting/index.tsx
View File

@ -1515,7 +1515,9 @@ const Meeting: React.FC = () => {
const getDesktopCapturerVideo = (): void => { const getDesktopCapturerVideo = (): void => {
agora.getDesktopCapturerVideo({ width: 300, height: 300 }, { width: 300, height: 300 }, true).then((res: any) => { agora.getDesktopCapturerVideo({ width: 300, height: 300 }, { width: 300, height: 300 }, true).then((res: any) => {
res.forEach((item: any, index: number) => { res.forEach((item: any, index: number) => {
item.sourceTitle = '桌面' + (index + 1) if (item.type === 1) {
item.sourceTitle = '桌面' + (index + 1)
}
if (item.thumbImage.buffer) { if (item.thumbImage.buffer) {
item.thumbnailUrl = thumbImageBufferToBase64(item.thumbImage) item.thumbnailUrl = thumbImageBufferToBase64(item.thumbImage)
} }