Remove trailing whitespaces and cleanup the code logic

This commit is contained in:
Cheng Zhao 2016-05-30 09:12:16 +09:00
Родитель ec53e49fad
Коммит 09796587b4
2 изменённых файлов: 6 добавлений и 8 удалений

Просмотреть файл

@ -137,16 +137,14 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
if (options.Get(options::kAlwaysOnTop, &top) && top) { if (options.Get(options::kAlwaysOnTop, &top) && top) {
SetAlwaysOnTop(true); SetAlwaysOnTop(true);
} }
// Disable fullscreen button if 'fullscreen' is specified to false.
bool fullscreenable = true; bool fullscreenable = true;
bool fullscreen = false; 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; 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 #endif
}
// Overriden by 'fullscreenable'. // Overriden by 'fullscreenable'.
options.Get(options::kFullScreenable, &fullscreenable); options.Get(options::kFullScreenable, &fullscreenable);
SetFullScreenable(fullscreenable); SetFullScreenable(fullscreenable);

Просмотреть файл

@ -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 * `fullscreen` Boolean - Whether the window should show in fullscreen. When
explicitly set to `false` the fullscreen button will be hidden or disabled explicitly set to `false` the fullscreen button will be hidden or disabled
on OS X. Default is `false`. on OS X. Default is `false`.
* `fullscreenable` Boolean - Whether the window can be put into fullscreen * `fullscreenable` Boolean - Whether the window can be put into fullscreen
mode. On OS X, also whether the maximize/zoom button should toggle full mode. On OS X, also whether the maximize/zoom button should toggle full
screen mode or maximize window. Default is `true`. screen mode or maximize window. Default is `true`.
* `skipTaskbar` Boolean - Whether to show the window in taskbar. Default is * `skipTaskbar` Boolean - Whether to show the window in taskbar. Default is
`false`. `false`.