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

Add BrowserWindow.isMaximized API.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-26 13:58:26 +08:00
parent e8d59c4326
commit ce50b38a75
8 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,6 +161,10 @@ void Window::Restore() {
window_->Restore(); window_->Restore();
} }
bool Window::IsMinimized() {
return window_->IsMinimized();
}
void Window::SetFullscreen(bool fullscreen) { void Window::SetFullscreen(bool fullscreen) {
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);
} }
@ -357,6 +361,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isMaximized", &Window::IsMaximized) .SetMethod("isMaximized", &Window::IsMaximized)
.SetMethod("minimize", &Window::Minimize) .SetMethod("minimize", &Window::Minimize)
.SetMethod("restore", &Window::Restore) .SetMethod("restore", &Window::Restore)
.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)

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

@ -66,6 +66,7 @@ class Window : public mate::EventEmitter,
bool IsMaximized(); bool IsMaximized();
void Minimize(); void Minimize();
void Restore(); void Restore();
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);

1
atom/browser/native_window.h
View file

@ -111,6 +111,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual bool IsMaximized() = 0; virtual bool IsMaximized() = 0;
virtual void Minimize() = 0; virtual void Minimize() = 0;
virtual void Restore() = 0; virtual void Restore() = 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;

1
atom/browser/native_window_mac.h
View file

@ -35,6 +35,7 @@ class NativeWindowMac : public NativeWindow {
virtual bool IsMaximized() OVERRIDE; virtual bool IsMaximized() OVERRIDE;
virtual void Minimize() OVERRIDE; virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE; virtual void Restore() 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;

4
atom/browser/native_window_mac.mm
View file

@ -304,6 +304,10 @@ void NativeWindowMac::Restore() {
[window_ deminiaturize:nil]; [window_ deminiaturize:nil];
} }
bool NativeWindowMac::IsMinimized() {
return [window_ isMiniaturized];
}
void NativeWindowMac::SetFullscreen(bool fullscreen) { void NativeWindowMac::SetFullscreen(bool fullscreen) {
if (fullscreen == IsFullscreen()) if (fullscreen == IsFullscreen())
return; return;

4
atom/browser/native_window_views.cc
View file

@ -187,6 +187,10 @@ void NativeWindowViews::Restore() {
window_->Restore(); window_->Restore();
} }
bool NativeWindowViews::IsMinimized() {
return window_->IsMinimized();
}
void NativeWindowViews::SetFullscreen(bool fullscreen) { void NativeWindowViews::SetFullscreen(bool fullscreen) {
window_->SetFullscreen(fullscreen); window_->SetFullscreen(fullscreen);
} }

1
atom/browser/native_window_views.h
View file

@ -46,6 +46,7 @@ class NativeWindowViews : public NativeWindow,
virtual bool IsMaximized() OVERRIDE; virtual bool IsMaximized() OVERRIDE;
virtual void Minimize() OVERRIDE; virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE; virtual void Restore() 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;

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

@ -252,6 +252,10 @@ the Dock.
Restores the window from minimized state to its previous state. Restores the window from minimized state to its previous state.
### BrowserWindow.isMaximized()
Returns whether the window is minimized.
### BrowserWindow.setFullScreen(flag) ### BrowserWindow.setFullScreen(flag)
* `flag` Boolean * `flag` Boolean