github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

mac: Fix crash when closing window, closes #504.

Browse Source
This commit is contained in:
Cheng Zhao
2014-07-25 10:38:19 +08:00
parent 6c866ea909
commit 53c73c0631
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
atom/browser/native_window_mac.mm
View File

@@ -52,11 +52,13 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
- (void)windowDidBecomeMain:(NSNotification*)notification {
shell_->NotifyWindowFocus();
if (shell_->GetWebContents())
shell_->GetWebContents()->GetView()->StoreFocus();
content::WebContents* web_contents = shell_->GetWebContents();
if (!web_contents)
return;
content::RenderWidgetHostView* rwhv =
shell_->GetWebContents()->GetRenderWidgetHostView();
web_contents->GetView()->RestoreFocus();
content::RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView();
if (rwhv)
rwhv->SetActive(true);
}
@@ -64,11 +66,13 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
- (void)windowDidResignMain:(NSNotification*)notification {
shell_->NotifyWindowBlur();
if (shell_->GetWebContents())
shell_->GetWebContents()->GetView()->StoreFocus();
content::WebContents* web_contents = shell_->GetWebContents();
if (!web_contents)
return;
content::RenderWidgetHostView* rwhv =
shell_->GetWebContents()->GetRenderWidgetHostView();
web_contents->GetView()->StoreFocus();
content::RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView();
if (rwhv)
rwhv->SetActive(false);
}