зеркало из https://github.com/electron/electron.git
Add isDevToolsFocused to webview
This commit is contained in:
Родитель
4cdee5547f
Коммит
14db4a1946
|
@ -468,10 +468,6 @@ bool Window::IsWebViewFocused() {
|
|||
return window_->IsWebViewFocused();
|
||||
}
|
||||
|
||||
bool Window::IsDevToolsFocused() {
|
||||
return window_->IsDevToolsFocused();
|
||||
}
|
||||
|
||||
void Window::SetRepresentedFilename(const std::string& filename) {
|
||||
window_->SetRepresentedFilename(filename);
|
||||
}
|
||||
|
@ -670,7 +666,6 @@ void Window::BuildPrototype(v8::Isolate* isolate,
|
|||
.SetMethod("focusOnWebView", &Window::FocusOnWebView)
|
||||
.SetMethod("blurWebView", &Window::BlurWebView)
|
||||
.SetMethod("isWebViewFocused", &Window::IsWebViewFocused)
|
||||
.SetMethod("isDevToolsFocused", &Window::IsDevToolsFocused)
|
||||
.SetMethod("capturePage", &Window::CapturePage)
|
||||
.SetMethod("setProgressBar", &Window::SetProgressBar)
|
||||
.SetMethod("setOverlayIcon", &Window::SetOverlayIcon)
|
||||
|
|
|
@ -121,7 +121,6 @@ class Window : public mate::TrackableObject<Window>,
|
|||
void FocusOnWebView();
|
||||
void BlurWebView();
|
||||
bool IsWebViewFocused();
|
||||
bool IsDevToolsFocused();
|
||||
void SetRepresentedFilename(const std::string& filename);
|
||||
std::string GetRepresentedFilename();
|
||||
void SetDocumentEdited(bool edited);
|
||||
|
|
|
@ -268,10 +268,6 @@ bool NativeWindow::IsWebViewFocused() {
|
|||
return host_view && host_view->HasFocus();
|
||||
}
|
||||
|
||||
bool NativeWindow::IsDevToolsFocused() {
|
||||
return inspectable_web_contents_->GetView()->IsDevToolsViewFocused();
|
||||
}
|
||||
|
||||
void NativeWindow::CapturePage(const gfx::Rect& rect,
|
||||
const CapturePageCallback& callback) {
|
||||
const auto view = web_contents()->GetRenderWidgetHostView();
|
||||
|
|
|
@ -157,7 +157,6 @@ class NativeWindow : public base::SupportsUserData,
|
|||
virtual void FocusOnWebView();
|
||||
virtual void BlurWebView();
|
||||
virtual bool IsWebViewFocused();
|
||||
virtual bool IsDevToolsFocused();
|
||||
|
||||
// Captures the page with |rect|, |callback| would be called when capturing is
|
||||
// done.
|
||||
|
|
|
@ -273,6 +273,7 @@ registerWebViewElement = ->
|
|||
'openDevTools'
|
||||
'closeDevTools'
|
||||
'isDevToolsOpened'
|
||||
'isDevToolsFocused'
|
||||
'inspectElement'
|
||||
'setAudioMuted'
|
||||
'isAudioMuted'
|
||||
|
|
|
@ -596,15 +596,19 @@ Removes the specified path from DevTools workspace.
|
|||
* `options` Object (optional). Properties:
|
||||
* `detach` Boolean - opens DevTools in a new window
|
||||
|
||||
Opens the developer tools.
|
||||
Opens the devtools.
|
||||
|
||||
### `webContents.closeDevTools()`
|
||||
|
||||
Closes the developer tools.
|
||||
Closes the devtools.
|
||||
|
||||
### `webContents.isDevToolsOpened()`
|
||||
|
||||
Returns whether the developer tools are opened.
|
||||
Returns whether the devtools is opened.
|
||||
|
||||
### `webContents.isDevToolsFocused()`
|
||||
|
||||
Returns whether the devtools view is focused .
|
||||
|
||||
### `webContents.toggleDevTools()`
|
||||
|
||||
|
|
|
@ -279,6 +279,10 @@ Closes the DevTools window of guest page.
|
|||
|
||||
Returns a boolean whether guest page has a DevTools window attached.
|
||||
|
||||
### `<webview>.isDevToolsFocused()`
|
||||
|
||||
Returns a boolean whether DevTools window of guest page is focused.
|
||||
|
||||
### `<webview>.inspectElement(x, y)`
|
||||
|
||||
* `x` Integer
|
||||
|
|
Загрузка…
Ссылка в новой задаче