github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Call WasShown when showing window

Browse Source 
Otherwise WebContents would be invisible when window is hidden at first
and then show later.

Refs #2879.
This commit is contained in:
Cheng Zhao
2015-09-24 18:15:57 +08:00
parent fc422e5d55
commit da57a3101f
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/native_window_mac.mm
View File

@@ -467,6 +467,8 @@ bool NativeWindowMac::IsFocused() {
}
void NativeWindowMac::Show() {
web_contents()->WasShown();
// This method is supposed to put focus on window, however if the app does not
// have focus then "makeKeyAndOrderFront" will only show the window.
[NSApp activateIgnoringOtherApps:YES];
@@ -475,11 +477,13 @@ void NativeWindowMac::Show() {
}
void NativeWindowMac::ShowInactive() {
web_contents()->WasShown();
[window_ orderFrontRegardless];
}
void NativeWindowMac::Hide() {
[window_ orderOut:nil];
web_contents()->WasHidden();
}
bool NativeWindowMac::IsVisible() {

3
atom/browser/native_window_views.cc
View File

@@ -338,15 +338,18 @@ bool NativeWindowViews::IsFocused() {
}
void NativeWindowViews::Show() {
web_contents()->WasShown();
window_->native_widget_private()->ShowWithWindowState(GetRestoredState());
}
void NativeWindowViews::ShowInactive() {
web_contents()->WasShown();
window_->ShowInactive();
}
void NativeWindowViews::Hide() {
window_->Hide();
web_contents()->WasHidden();
}
bool NativeWindowViews::IsVisible() {