diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc index d73433adfd..c22159fc25 100644 --- a/atom/browser/native_window.cc +++ b/atom/browser/native_window.cc @@ -137,16 +137,14 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) { if (options.Get(options::kAlwaysOnTop, &top) && top) { SetAlwaysOnTop(true); } - // Disable fullscreen button if 'fullscreen' is specified to false. bool fullscreenable = true; bool fullscreen = false; - if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen) + if (options.Get(options::kFullscreen, &fullscreen) && !fullscreen) { + // Disable fullscreen button if 'fullscreen' is specified to false. + #if defined(OS_MACOSX) fullscreenable = false; - // On Windows, we can only enter fullscreen via API - // Ensure that setFullscreen(true) is usable by default - #if defined(OS_WIN) - fullscreenable = true; #endif + } // Overriden by 'fullscreenable'. options.Get(options::kFullScreenable, &fullscreenable); SetFullScreenable(fullscreenable); diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md index be70ef8f19..ecdbece771 100644 --- a/docs/api/browser-window.md +++ b/docs/api/browser-window.md @@ -59,8 +59,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`. * `fullscreen` Boolean - Whether the window should show in fullscreen. When explicitly set to `false` the fullscreen button will be hidden or disabled on OS X. Default is `false`. - * `fullscreenable` Boolean - Whether the window can be put into fullscreen - mode. On OS X, also whether the maximize/zoom button should toggle full + * `fullscreenable` Boolean - Whether the window can be put into fullscreen + mode. On OS X, also whether the maximize/zoom button should toggle full screen mode or maximize window. Default is `true`. * `skipTaskbar` Boolean - Whether to show the window in taskbar. Default is `false`.