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

Merge branch 'master' into chrome35

Browse source 
Conflicts:
	atom/browser/native_window_gtk.h
This commit is contained in:
Cheng Zhao 2014-07-07 23:49:28 +08:00
commit ee5312fff9
12 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,6 +149,10 @@ void Window::Unmaximize() {
window_->Unmaximize();
}
bool Window::IsMaximized() {
return window_->IsMaximized();
}
void Window::Minimize() {
window_->Minimize();
}
@ -342,6 +346,7 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("isVisible", &Window::IsVisible)
.SetMethod("maximize", &Window::Maximize)
.SetMethod("unmaximize", &Window::Unmaximize)
.SetMethod("isMaximized", &Window::IsMaximized)
.SetMethod("minimize", &Window::Minimize)
.SetMethod("restore", &Window::Restore)
.SetMethod("setFullScreen", &Window::SetFullscreen)

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

@ -63,6 +63,7 @@ class Window : public mate::EventEmitter,
bool IsVisible();
void Maximize();
void Unmaximize();
bool IsMaximized();
void Minimize();
void Restore();
void SetFullscreen(bool fullscreen);

1
atom/browser/native_window.h
View file

@ -107,6 +107,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual bool IsVisible() = 0;
virtual void Maximize() = 0;
virtual void Unmaximize() = 0;
virtual bool IsMaximized() = 0;
virtual void Minimize() = 0;
virtual void Restore() = 0;
virtual void SetFullscreen(bool fullscreen) = 0;

1
atom/browser/native_window_mac.h
View file

@ -32,6 +32,7 @@ class NativeWindowMac : public NativeWindow {
virtual bool IsVisible() OVERRIDE;
virtual void Maximize() OVERRIDE;
virtual void Unmaximize() OVERRIDE;
virtual bool IsMaximized() OVERRIDE;
virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE;
virtual void SetFullscreen(bool fullscreen) OVERRIDE;

4
atom/browser/native_window_mac.mm
View file

@ -279,6 +279,10 @@ void NativeWindowMac::Unmaximize() {
[window_ zoom:nil];
}
bool NativeWindowMac::IsMaximized() {
return [window_ isZoomed];
}
void NativeWindowMac::Minimize() {
[window_ miniaturize:nil];
}

4
atom/browser/native_window_views.cc
View file

@ -140,6 +140,10 @@ void NativeWindowViews::Unmaximize() {
window_->Restore();
}
bool NativeWindowViews::IsMaximized() {
return window_->IsMaximized();
}
void NativeWindowViews::Minimize() {
window_->Minimize();
}

1
atom/browser/native_window_views.h
View file

@ -38,6 +38,7 @@ class NativeWindowViews : public NativeWindow,
virtual bool IsVisible() OVERRIDE;
virtual void Maximize() OVERRIDE;
virtual void Unmaximize() OVERRIDE;
virtual bool IsMaximized() OVERRIDE;
virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE;
virtual void SetFullscreen(bool fullscreen) OVERRIDE;

4
atom/browser/native_window_win.cc
View file

@ -294,6 +294,10 @@ void NativeWindowWin::Unmaximize() {
window_->Restore();
}
bool NativeWindowWin::IsMaximized() {
return window_->IsMaximized();
}
bool NativeWindowWin::IsVisible() {
return window_->IsVisible();
}

1
atom/browser/native_window_win.h
View file

@ -49,6 +49,7 @@ class NativeWindowWin : public NativeWindow,
virtual bool IsVisible() OVERRIDE;
virtual void Maximize() OVERRIDE;
virtual void Unmaximize() OVERRIDE;
virtual bool IsMaximized() OVERRIDE;
virtual void Minimize() OVERRIDE;
virtual void Restore() OVERRIDE;
virtual void SetFullscreen(bool fullscreen) OVERRIDE;