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

views: Focus webContents in BrowserWindow

Browse Source
This commit is contained in:
Cheng Zhao
2018-03-06 15:17:42 +09:00
parent 8bbe28e998
commit bf862d1d07
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
atom/browser/api/atom_api_browser_window.cc
View File

@@ -379,6 +379,9 @@ void BrowserWindow::OnWindowFocus() {
auto* rwhv = web_contents()->GetRenderWidgetHostView();
if (rwhv)
rwhv->SetActive(true);
#else
if (!api_web_contents_->IsDevToolsOpened())
web_contents()->Focus();
#endif
Emit("focus");

4
atom/browser/native_window_views.cc
View File

@@ -1183,10 +1183,6 @@ void NativeWindowViews::OnWidgetActivationChanged(
&NativeWindow::NotifyWindowBlur,
GetWeakPtr()));
if (active && inspectable_web_contents() &&
!inspectable_web_contents()->IsDevToolsViewShowing())
web_contents()->Focus();
// Hide menu bar when window is blured.
if (!active && menu_bar_autohide_ && menu_bar_visible_)
SetMenuBarVisibility(false);