mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use new styles of browserWindow options

Browse source
This commit is contained in:
Cheng Zhao 2015-11-11 10:33:59 +08:00
parent ba457681b2
commit 60ec1ca3f7
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/default_app/default_app.js
View file

@ -12,8 +12,8 @@ app.on('ready', function() {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
width: 800, width: 800,
height: 600, height: 600,
'auto-hide-menu-bar': true, autoHideMenuBar: true,
'use-content-size': true, useContentSize: true,
}); });
mainWindow.loadUrl('file://' + __dirname + '/index.html'); mainWindow.loadUrl('file://' + __dirname + '/index.html');
mainWindow.focus(); mainWindow.focus();

20
spec/api-browser-window-spec.coffee
View file

@ -138,10 +138,10 @@ describe 'browser-window module', ->
w.setResizable not w.isResizable() w.setResizable not w.isResizable()
assert.deepEqual s, w.getSize() assert.deepEqual s, w.getSize()
describe '"use-content-size" option', -> describe '"useContentSize" option', ->
it 'make window created with content size when used', -> it 'make window created with content size when used', ->
w.destroy() w.destroy()
w = new BrowserWindow(show: false, width: 400, height: 400, 'use-content-size': true) w = new BrowserWindow(show: false, width: 400, height: 400, useContentSize: true)
contentSize = w.getContentSize() contentSize = w.getContentSize()
assert.equal contentSize[0], 400 assert.equal contentSize[0], 400
assert.equal contentSize[1], 400 assert.equal contentSize[1], 400
@ -153,7 +153,7 @@ describe 'browser-window module', ->
it 'works for framless window', -> it 'works for framless window', ->
w.destroy() w.destroy()
w = new BrowserWindow(show: false, frame: false, width: 400, height: 400, 'use-content-size': true) w = new BrowserWindow(show: false, frame: false, width: 400, height: 400, useContentSize: true)
contentSize = w.getContentSize() contentSize = w.getContentSize()
assert.equal contentSize[0], 400 assert.equal contentSize[0], 400
assert.equal contentSize[1], 400 assert.equal contentSize[1], 400
@ -167,22 +167,22 @@ describe 'browser-window module', ->
it 'creates browser window with hidden title bar', -> it 'creates browser window with hidden title bar', ->
w.destroy() w.destroy()
w = new BrowserWindow(show: false, width: 400, height: 400, 'title-bar-style': 'hidden') w = new BrowserWindow(show: false, width: 400, height: 400, titleBarStyle: 'hidden')
contentSize = w.getContentSize() contentSize = w.getContentSize()
assert.equal contentSize[1], 400 assert.equal contentSize[1], 400
it 'creates browser window with hidden inset title bar', -> it 'creates browser window with hidden inset title bar', ->
w.destroy() w.destroy()
w = new BrowserWindow(show: false, width: 400, height: 400, 'title-bar-style': 'hidden-inset') w = new BrowserWindow(show: false, width: 400, height: 400, titleBarStyle: 'hidden-inset')
contentSize = w.getContentSize() contentSize = w.getContentSize()
assert.equal contentSize[1], 400 assert.equal contentSize[1], 400
describe '"enable-larger-than-screen" option', -> describe '"enableLargerThanScreen" option', ->
return if process.platform is 'linux' return if process.platform is 'linux'
beforeEach -> beforeEach ->
w.destroy() w.destroy()
w = new BrowserWindow(show: true, width: 400, height: 400, 'enable-larger-than-screen': true) w = new BrowserWindow(show: true, width: 400, height: 400, enableLargerThanScreen: true)
it 'can move the window out of screen', -> it 'can move the window out of screen', ->
w.setPosition -10, -10 w.setPosition -10, -10
@ -212,7 +212,7 @@ describe 'browser-window module', ->
w.destroy() w.destroy()
w = new BrowserWindow w = new BrowserWindow
show: false show: false
'web-preferences': webPreferences:
preload: preload preload: preload
w.loadUrl 'file://' + path.join(fixtures, 'api', 'preload.html') w.loadUrl 'file://' + path.join(fixtures, 'api', 'preload.html')
@ -225,9 +225,9 @@ describe 'browser-window module', ->
w.destroy() w.destroy()
w = new BrowserWindow w = new BrowserWindow
show: false show: false
'web-preferences': webPreferences:
preload: preload preload: preload
'node-integration': false nodeIntegration: false
w.loadUrl 'file://' + path.join(fixtures, 'api', 'blank.html') w.loadUrl 'file://' + path.join(fixtures, 'api', 'blank.html')
describe 'beforeunload handler', -> describe 'beforeunload handler', ->