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

SetFullscreen => SetFullScreen

Browse source
This commit is contained in:
Cheng Zhao 2014-11-25 14:34:14 +08:00
parent 28ca883805
commit 271eb63083
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -217,8 +217,8 @@ bool Window::IsMinimized() {
return window_->IsMinimized(); return window_->IsMinimized();
} }
void Window::SetFullscreen(bool fullscreen) { void Window::SetFullScreen(bool fullscreen) {
window_->SetFullscreen(fullscreen); window_->SetFullScreen(fullscreen);
} }
bool Window::IsFullscreen() { bool Window::IsFullscreen() {
@ -446,7 +446,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("minimize", &Window::Minimize) .SetMethod("minimize", &Window::Minimize)
.SetMethod("restore", &Window::Restore) .SetMethod("restore", &Window::Restore)
.SetMethod("isMinimized", &Window::IsMinimized) .SetMethod("isMinimized", &Window::IsMinimized)
.SetMethod("setFullScreen", &Window::SetFullscreen) .SetMethod("setFullScreen", &Window::SetFullScreen)
.SetMethod("isFullScreen", &Window::IsFullscreen) .SetMethod("isFullScreen", &Window::IsFullscreen)
.SetMethod("getSize", &Window::GetSize) .SetMethod("getSize", &Window::GetSize)
.SetMethod("setSize", &Window::SetSize) .SetMethod("setSize", &Window::SetSize)

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

@ -80,7 +80,7 @@ class Window : public mate::EventEmitter,
void Minimize(); void Minimize();
void Restore(); void Restore();
bool IsMinimized(); bool IsMinimized();
void SetFullscreen(bool fullscreen); void SetFullScreen(bool fullscreen);
bool IsFullscreen(); bool IsFullscreen();
void SetSize(int width, int height); void SetSize(int width, int height);
std::vector<int> GetSize(); std::vector<int> GetSize();

2
atom/browser/native_window.cc
View file

@ -204,7 +204,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
} }
bool fullscreen; bool fullscreen;
if (options.Get(switches::kFullscreen, &fullscreen) && fullscreen) { if (options.Get(switches::kFullscreen, &fullscreen) && fullscreen) {
SetFullscreen(true); SetFullScreen(true);
} }
bool skip; bool skip;
if (options.Get(switches::kSkipTaskbar, &skip) && skip) { if (options.Get(switches::kSkipTaskbar, &skip) && skip) {

2
atom/browser/native_window.h
View file

@ -111,7 +111,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void Minimize() = 0; virtual void Minimize() = 0;
virtual void Restore() = 0; virtual void Restore() = 0;
virtual bool IsMinimized() = 0; virtual bool IsMinimized() = 0;
virtual void SetFullscreen(bool fullscreen) = 0; virtual void SetFullScreen(bool fullscreen) = 0;
virtual bool IsFullscreen() = 0; virtual bool IsFullscreen() = 0;
virtual void SetSize(const gfx::Size& size) = 0; virtual void SetSize(const gfx::Size& size) = 0;
virtual gfx::Size GetSize() = 0; virtual gfx::Size GetSize() = 0;

2
atom/browser/native_window_mac.h
View file

@ -37,7 +37,7 @@ class NativeWindowMac : public NativeWindow {
virtual void Minimize() OVERRIDE; virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE; virtual void Restore() OVERRIDE;
virtual bool IsMinimized() OVERRIDE; virtual bool IsMinimized() OVERRIDE;
virtual void SetFullscreen(bool fullscreen) OVERRIDE; virtual void SetFullScreen(bool fullscreen) OVERRIDE;
virtual bool IsFullscreen() OVERRIDE; virtual bool IsFullscreen() OVERRIDE;
virtual void SetSize(const gfx::Size& size) OVERRIDE; virtual void SetSize(const gfx::Size& size) OVERRIDE;
virtual gfx::Size GetSize() OVERRIDE; virtual gfx::Size GetSize() OVERRIDE;

6
atom/browser/native_window_mac.mm
View file

@ -400,7 +400,7 @@ bool NativeWindowMac::IsMinimized() {
return [window_ isMiniaturized]; return [window_ isMiniaturized];
} }
void NativeWindowMac::SetFullscreen(bool fullscreen) { void NativeWindowMac::SetFullScreen(bool fullscreen) {
if (fullscreen == IsFullscreen()) if (fullscreen == IsFullscreen())
return; return;
@ -545,10 +545,10 @@ void NativeWindowMac::SetKiosk(bool kiosk) {
NSApplicationPresentationDisableHideApplication; NSApplicationPresentationDisableHideApplication;
[NSApp setPresentationOptions:options]; [NSApp setPresentationOptions:options];
is_kiosk_ = true; is_kiosk_ = true;
SetFullscreen(true); SetFullScreen(true);
} else if (!kiosk && is_kiosk_) { } else if (!kiosk && is_kiosk_) {
is_kiosk_ = false; is_kiosk_ = false;
SetFullscreen(false); SetFullScreen(false);
[NSApp setPresentationOptions:kiosk_options_]; [NSApp setPresentationOptions:kiosk_options_];
} }
} }

4
atom/browser/native_window_views.cc
View file

@ -318,7 +318,7 @@ bool NativeWindowViews::IsMinimized() {
return window_->IsMinimized(); return window_->IsMinimized();
} }
void NativeWindowViews::SetFullscreen(bool fullscreen) { void NativeWindowViews::SetFullScreen(bool fullscreen) {
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);
#if defined(OS_WIN) #if defined(OS_WIN)
// There is no native fullscreen state on Windows. // There is no native fullscreen state on Windows.
@ -498,7 +498,7 @@ void NativeWindowViews::SetSkipTaskbar(bool skip) {
} }
void NativeWindowViews::SetKiosk(bool kiosk) { void NativeWindowViews::SetKiosk(bool kiosk) {
SetFullscreen(kiosk); SetFullScreen(kiosk);
} }
bool NativeWindowViews::IsKiosk() { bool NativeWindowViews::IsKiosk() {

2
atom/browser/native_window_views.h
View file

@ -48,7 +48,7 @@ class NativeWindowViews : public NativeWindow,
void Minimize() override; void Minimize() override;
void Restore() override; void Restore() override;
bool IsMinimized() override; bool IsMinimized() override;
void SetFullscreen(bool fullscreen) override; void SetFullScreen(bool fullscreen) override;
bool IsFullscreen() override; bool IsFullscreen() override;
void SetSize(const gfx::Size& size) override; void SetSize(const gfx::Size& size) override;
gfx::Size GetSize() override; gfx::Size GetSize() override;