kalugin66/webtorrent-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #788 from feross/content-bounds

Browse Source 
Only use setContentBounds for player view
This commit is contained in:
Feross Aboukhadijeh
2016-08-22 01:56:14 +02:00
committed by GitHub
parent 06fdd80845 51a9b2ea9b
commit 78790e73c7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/windows/main.js
View File

@@ -143,7 +143,11 @@ function setBounds (bounds, maximize) {
} }
// Resize the window's content area (so window border doesn't need to be taken // Resize the window's content area (so window border doesn't need to be taken
// into account) // into account)
main.win.setContentBounds(bounds, true) if (bounds.contentBounds) {
main.win.setContentBounds(bounds, true)
} else {
main.win.setBounds(bounds, true)
}
} else { } else {
log('setBounds: not setting bounds because of window maximization') log('setBounds: not setting bounds because of window maximization')
} }

2
src/renderer/main.js
View File

@@ -362,7 +362,7 @@ function setDimensions (dimensions) {
) )
ipcRenderer.send('setAspectRatio', aspectRatio) ipcRenderer.send('setAspectRatio', aspectRatio)
ipcRenderer.send('setBounds', {x: null, y: null, width, height}) ipcRenderer.send('setBounds', {contentBounds: true, x: null, y: null, width, height})
state.playing.aspectRatio = aspectRatio state.playing.aspectRatio = aspectRatio
} }