mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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(); auto* rwhv = web_contents()->GetRenderWidgetHostView();
if (rwhv) if (rwhv)
rwhv->SetActive(true); rwhv->SetActive(true);
#else
if (!api_web_contents_->IsDevToolsOpened())
web_contents()->Focus();
#endif #endif
Emit("focus"); Emit("focus");

4
atom/browser/native_window_views.cc
View file

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