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

Fix building on Windows, close #1896

Browse Source
This commit is contained in:
Cheng Zhao
2015-06-08 13:19:56 +08:00
parent 13c1b078f9
commit 5ae9c633ca
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
atom/browser/common_web_contents_delegate.cc
View File

@@ -11,6 +11,7 @@
#include "atom/browser/native_window.h"
#include "atom/browser/ui/file_dialog.h"
#include "atom/browser/web_dialog_helper.h"
#include "base/files/file_util.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/render_process_host.h"

3
atom/browser/native_window_views.cc
View File

@@ -726,7 +726,8 @@ void NativeWindowViews::OnWidgetActivationChanged(
else
NotifyWindowBlur();
if (active && GetWebContents() && !IsDevToolsOpened())
if (active && GetWebContents() &&
!inspectable_web_contents()->IsDevToolsViewShowing())
GetWebContents()->Focus();
// Hide menu bar when window is blured.