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

Fullscreenable => FullScreenable

Browse source
This commit is contained in:
Cheng Zhao 2016-01-22 23:47:37 -08:00
parent d6f2b7c982
commit 5372b6cd91
10 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/api/atom_api_window.cc
View file

@ -432,12 +432,12 @@ bool Window::IsMaximizable() {
return window_->IsMaximizable(); return window_->IsMaximizable();
} }
void Window::SetFullscreenable(bool fullscreenable) { void Window::SetFullScreenable(bool fullscreenable) {
window_->SetFullscreenable(fullscreenable); window_->SetFullScreenable(fullscreenable);
} }
bool Window::IsFullscreenable() { bool Window::IsFullScreenable() {
return window_->IsFullscreenable(); return window_->IsFullScreenable();
} }
void Window::SetClosable(bool closable) { void Window::SetClosable(bool closable) {
@ -713,8 +713,8 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isMinimizable", &Window::IsMinimizable) .SetMethod("isMinimizable", &Window::IsMinimizable)
.SetMethod("setMaximizable", &Window::SetMaximizable) .SetMethod("setMaximizable", &Window::SetMaximizable)
.SetMethod("isMaximizable", &Window::IsMaximizable) .SetMethod("isMaximizable", &Window::IsMaximizable)
.SetMethod("setFullscreenable", &Window::SetFullscreenable) .SetMethod("setFullScreenable", &Window::SetFullScreenable)
.SetMethod("isFullscreenable", &Window::IsFullscreenable) .SetMethod("isFullScreenable", &Window::IsFullScreenable)
.SetMethod("setClosable", &Window::SetClosable) .SetMethod("setClosable", &Window::SetClosable)
.SetMethod("isClosable", &Window::IsClosable) .SetMethod("isClosable", &Window::IsClosable)
.SetMethod("setAlwaysOnTop", &Window::SetAlwaysOnTop) .SetMethod("setAlwaysOnTop", &Window::SetAlwaysOnTop)

4
atom/browser/api/atom_api_window.h
View file

@ -112,8 +112,8 @@ class Window : public mate::TrackableObject<Window>,
bool IsMinimizable(); bool IsMinimizable();
void SetMaximizable(bool maximizable); void SetMaximizable(bool maximizable);
bool IsMaximizable(); bool IsMaximizable();
void SetFullscreenable(bool fullscreenable); void SetFullScreenable(bool fullscreenable);
bool IsFullscreenable(); bool IsFullScreenable();
void SetClosable(bool closable); void SetClosable(bool closable);
bool IsClosable(); bool IsClosable();
void SetAlwaysOnTop(bool top); void SetAlwaysOnTop(bool top);

4
atom/browser/native_window.h
View file

@ -131,8 +131,8 @@ class NativeWindow : public base::SupportsUserData,
virtual bool IsMinimizable() = 0; virtual bool IsMinimizable() = 0;
virtual void SetMaximizable(bool maximizable) = 0; virtual void SetMaximizable(bool maximizable) = 0;
virtual bool IsMaximizable() = 0; virtual bool IsMaximizable() = 0;
virtual void SetFullscreenable(bool fullscreenable) = 0; virtual void SetFullScreenable(bool fullscreenable) = 0;
virtual bool IsFullscreenable() = 0; virtual bool IsFullScreenable() = 0;
virtual void SetClosable(bool closable) = 0; virtual void SetClosable(bool closable) = 0;
virtual bool IsClosable() = 0; virtual bool IsClosable() = 0;
virtual void SetAlwaysOnTop(bool top) = 0; virtual void SetAlwaysOnTop(bool top) = 0;

4
atom/browser/native_window_mac.h
View file

@ -54,8 +54,8 @@ class NativeWindowMac : public NativeWindow {
bool IsMinimizable() override; bool IsMinimizable() override;
void SetMaximizable(bool maximizable) override; void SetMaximizable(bool maximizable) override;
bool IsMaximizable() override; bool IsMaximizable() override;
void SetFullscreenable(bool fullscreenable) override; void SetFullScreenable(bool fullscreenable) override;
bool IsFullscreenable() override; bool IsFullScreenable() override;
void SetClosable(bool closable) override; void SetClosable(bool closable) override;
bool IsClosable() override; bool IsClosable() override;
void SetAlwaysOnTop(bool top) override; void SetAlwaysOnTop(bool top) override;

8
atom/browser/native_window_mac.mm
View file

@ -376,7 +376,7 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kMaximizable, &maximizable); options.Get(options::kMaximizable, &maximizable);
bool fullscreenable = true; bool fullscreenable = true;
options.Get(options::kFullscreenable, &fullscreenable); options.Get(options::kFullScreenable, &fullscreenable);
bool closable = true; bool closable = true;
options.Get(options::kClosable, &closable); options.Get(options::kClosable, &closable);
@ -501,7 +501,7 @@ NativeWindowMac::NativeWindowMac(
options.Get(options::kFullscreen, &fullscreen); options.Get(options::kFullscreen, &fullscreen);
if (fullscreenable) { if (fullscreenable) {
SetFullscreenable(true); SetFullScreenable(true);
} else if (base::mac::IsOSElCapitanOrLater()) { } else if (base::mac::IsOSElCapitanOrLater()) {
// On EL Capitan this flag is required to hide fullscreen button. // On EL Capitan this flag is required to hide fullscreen button.
NSUInteger collectionBehavior = [window_ collectionBehavior]; NSUInteger collectionBehavior = [window_ collectionBehavior];
@ -710,7 +710,7 @@ bool NativeWindowMac::IsMaximizable() {
return [[window_ standardWindowButton:NSWindowZoomButton] isEnabled]; return [[window_ standardWindowButton:NSWindowZoomButton] isEnabled];
} }
void NativeWindowMac::SetFullscreenable(bool fullscreenable) { void NativeWindowMac::SetFullScreenable(bool fullscreenable) {
bool maximizable = IsMaximizable(); bool maximizable = IsMaximizable();
NSUInteger collectionBehavior = [window_ collectionBehavior]; NSUInteger collectionBehavior = [window_ collectionBehavior];
if (fullscreenable) { if (fullscreenable) {
@ -724,7 +724,7 @@ void NativeWindowMac::SetFullscreenable(bool fullscreenable) {
} }
} }
bool NativeWindowMac::IsFullscreenable() { bool NativeWindowMac::IsFullScreenable() {
return [window_ collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary; return [window_ collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary;
} }

4
atom/browser/native_window_views.cc
View file

@ -495,10 +495,10 @@ bool NativeWindowViews::IsMaximizable() {
#endif #endif
} }
void NativeWindowViews::SetFullscreenable(bool maximizable) { void NativeWindowViews::SetFullScreenable(bool maximizable) {
} }
bool NativeWindowViews::IsFullscreenable() { bool NativeWindowViews::IsFullScreenable() {
return true; return true;
} }

4
atom/browser/native_window_views.h
View file

@ -74,8 +74,8 @@ class NativeWindowViews : public NativeWindow,
bool IsMinimizable() override; bool IsMinimizable() override;
void SetMaximizable(bool maximizable) override; void SetMaximizable(bool maximizable) override;
bool IsMaximizable() override; bool IsMaximizable() override;
void SetFullscreenable(bool fullscreenable) override; void SetFullScreenable(bool fullscreenable) override;
bool IsFullscreenable() override; bool IsFullScreenable() override;
void SetClosable(bool closable) override; void SetClosable(bool closable) override;
bool IsClosable() override; bool IsClosable() override;
void SetAlwaysOnTop(bool top) override; void SetAlwaysOnTop(bool top) override;

2
atom/common/options_switches.cc
View file

@ -25,7 +25,7 @@ const char kResizable[] = "resizable";
const char kMovable[] = "movable"; const char kMovable[] = "movable";
const char kMinimizable[] = "minimizable"; const char kMinimizable[] = "minimizable";
const char kMaximizable[] = "maximizable"; const char kMaximizable[] = "maximizable";
const char kFullscreenable[] = "fullscreenable"; const char kFullScreenable[] = "fullscreenable";
const char kClosable[] = "closable"; const char kClosable[] = "closable";
const char kFullscreen[] = "fullscreen"; const char kFullscreen[] = "fullscreen";

2
atom/common/options_switches.h
View file

@ -26,7 +26,7 @@ extern const char kResizable[];
extern const char kMovable[]; extern const char kMovable[];
extern const char kMinimizable[]; extern const char kMinimizable[];
extern const char kMaximizable[]; extern const char kMaximizable[];
extern const char kFullscreenable[]; extern const char kFullScreenable[];
extern const char kClosable[]; extern const char kClosable[];
extern const char kFullscreen[]; extern const char kFullscreen[];
extern const char kSkipTaskbar[]; extern const char kSkipTaskbar[];

4
docs/api/browser-window.md
View file

@ -575,14 +575,14 @@ nothing.
Returns whether the window can be manually maximized by user. On Linux always Returns whether the window can be manually maximized by user. On Linux always
returns `true`. returns `true`.
### `win.setFullscreenable(fullscreenable)` _OS X_ ### `win.setFullScreenable(fullscreenable)` _OS X_
* `fullscreenable` Boolean * `fullscreenable` Boolean
Sets whether the maximize/zoom window button toggles fullscreen mode or Sets whether the maximize/zoom window button toggles fullscreen mode or
maximizes the window. On Windows and Linux does nothing. maximizes the window. On Windows and Linux does nothing.
### `win.isFullscreenable()` _OS X_ ### `win.isFullScreenable()` _OS X_
Returns whether the maximize/zoom window button toggles fullscreen mode or Returns whether the maximize/zoom window button toggles fullscreen mode or
maximizes the window. On Windows and Linux always returns `true`. maximizes the window. On Windows and Linux always returns `true`.