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

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];
}