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

Merge pull request #772 from feross/electron-1.3.3

Browse Source 
Update Electron to 1.3.3
This commit is contained in:
Feross Aboukhadijeh
2016-08-11 06:54:51 +02:00
committed by GitHub
parent 8420c65d25 3232e96f6e
commit 0fa3b678b0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -22,7 +22,7 @@
"deep-equal": "^1.0.1", "deep-equal": "^1.0.1",
"dlnacasts": "^0.1.0", "dlnacasts": "^0.1.0",
"drag-drop": "^2.12.1", "drag-drop": "^2.12.1",
"electron-prebuilt": "1.3.2", "electron-prebuilt": "1.3.3",
"fs-extra": "^0.30.0", "fs-extra": "^0.30.0",
"hat": "0.0.3", "hat": "0.0.3",
"iso-639-1": "^1.2.1", "iso-639-1": "^1.2.1",

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

@@ -141,7 +141,9 @@ function setBounds (bounds, maximize) {
bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2) bounds.y = Math.round(scr.bounds.y + scr.bounds.height / 2 - bounds.height / 2)
log('setBounds: centered to ' + JSON.stringify(bounds)) log('setBounds: centered to ' + JSON.stringify(bounds))
} }
main.win.setBounds(bounds, true) // Resize the window's content area (so window border doesn't need to be taken
// into account)
main.win.setContentBounds(bounds, true)
} else { } else {
log('setBounds: not setting bounds because of window maximization') log('setBounds: not setting bounds because of window maximization')
} }