Merge branch 'master' into chrome35
Conflicts: atom/browser/native_window_gtk.h
This commit is contained in:
commit
ee5312fff9
12 changed files with 37 additions and 1 deletions
|
@ -239,6 +239,10 @@ Maximizes the window.
|
|||
|
||||
Unmaximizes the window.
|
||||
|
||||
### BrowserWindow.isMaximized()
|
||||
|
||||
Returns whether the window is maximized.
|
||||
|
||||
### BrowserWindow.minimize()
|
||||
|
||||
Minimizes the window. On some platforms the minimized window will be shown in
|
||||
|
@ -394,6 +398,10 @@ Opens the developer tools.
|
|||
|
||||
Closes the developer tools.
|
||||
|
||||
### BrowserWindow.toggleDevTools()
|
||||
|
||||
Toggle the developer tools.
|
||||
|
||||
### BrowserWindow.inspectElement(x, y)
|
||||
|
||||
* `x` Integer
|
||||
|
|
|
@ -1,6 +1,12 @@
|
|||
# screen
|
||||
|
||||
Gets various info about screen size, displays, cursor position, etc.
|
||||
```js
|
||||
var Screen = require('screen');
|
||||
var BrowserWindow = require('browser-window');
|
||||
var size = Screen.getPrimaryDisplay().workAreaSize;
|
||||
mainWindow = new BrowserWindow({ width: size.width, height: size.height });
|
||||
```
|
||||
|
||||
## screen.getCursorScreenPoint()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue