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

fix: WCO occlusion of DevTools (#35209)

Browse source
This commit is contained in:
Shelley Vohr 2022-08-11 15:16:12 +02:00 • committed by GitHub
parent eab7ab2c47
commit 4d54cadb28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/api/web-contents.md
View file

@ -1568,6 +1568,8 @@ Opens the devtools.
When `contents` is a `<webview>` tag, the `mode` would be `detach` by default, When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
explicitly passing an empty `mode` can force using last used dock state. explicitly passing an empty `mode` can force using last used dock state.
On Windows, if Windows Control Overlay is enabled, Devtools will be opened with `mode: 'detach'`.
#### `contents.closeDevTools()` #### `contents.closeDevTools()`
Closes the devtools. Closes the devtools.

9
shell/browser/api/electron_api_web_contents.cc
View file

@ -175,6 +175,7 @@
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
#include "printing/backend/win_helper.h" #include "printing/backend/win_helper.h"
#include "shell/browser/native_window_views.h"
#endif #endif
#endif #endif
@ -2419,6 +2420,14 @@ void WebContents::OpenDevTools(gin::Arguments* args) {
} }
} }
#if BUILDFLAG(IS_WIN)
auto* win = static_cast<NativeWindowViews*>(owner_window());
// Force a detached state when WCO is enabled to match Chrome
// behavior and prevent occlusion of DevTools.
if (win && win->IsWindowControlsOverlayEnabled())
state = "detach";
#endif
DCHECK(inspectable_web_contents_); DCHECK(inspectable_web_contents_);
inspectable_web_contents_->SetDockState(state); inspectable_web_contents_->SetDockState(state);
inspectable_web_contents_->ShowDevTools(activate); inspectable_web_contents_->ShowDevTools(activate);