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

Add AtomWindow.isWebViewFocused() API, fixes #57.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-16 12:56:25 +08:00
parent a33c068ed1
commit a949e9542d
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
browser/api/atom_api_window.cc
View file

@ -445,6 +445,12 @@ v8::Handle<v8::Value> Window::BlurWebView(const v8::Arguments &args) {
return v8::Undefined(); return v8::Undefined();
} }
// static
v8::Handle<v8::Value> Window::IsWebViewFocused(const v8::Arguments& args) {
UNWRAP_WINDOW_AND_CHECK;
return v8::Boolean::New(self->window_->IsWebViewFocused());
}
// static // static
v8::Handle<v8::Value> Window::RestartHangMonitorTimeout( v8::Handle<v8::Value> Window::RestartHangMonitorTimeout(
const v8::Arguments &args) { const v8::Arguments &args) {
@ -690,6 +696,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "inspectElement", InspectElement); NODE_SET_PROTOTYPE_METHOD(t, "inspectElement", InspectElement);
NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView); NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView);
NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView); NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView);
NODE_SET_PROTOTYPE_METHOD(t, "isWebViewFocused", IsWebViewFocused);
NODE_SET_PROTOTYPE_METHOD(t, NODE_SET_PROTOTYPE_METHOD(t,
"restartHangMonitorTimeout", "restartHangMonitorTimeout",
RestartHangMonitorTimeout); RestartHangMonitorTimeout);

1
browser/api/atom_api_window.h
View file

@ -81,6 +81,7 @@ class Window : public EventEmitter,
static v8::Handle<v8::Value> InspectElement(const v8::Arguments &args); static v8::Handle<v8::Value> InspectElement(const v8::Arguments &args);
static v8::Handle<v8::Value> FocusOnWebView(const v8::Arguments &args); static v8::Handle<v8::Value> FocusOnWebView(const v8::Arguments &args);
static v8::Handle<v8::Value> BlurWebView(const v8::Arguments &args); static v8::Handle<v8::Value> BlurWebView(const v8::Arguments &args);
static v8::Handle<v8::Value> IsWebViewFocused(const v8::Arguments& args);
static v8::Handle<v8::Value> RestartHangMonitorTimeout( static v8::Handle<v8::Value> RestartHangMonitorTimeout(
const v8::Arguments &args); const v8::Arguments &args);

5
browser/native_window.cc
View file

@ -24,6 +24,7 @@
#include "content/public/browser/notification_types.h" #include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h" #include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "common/api/api_messages.h" #include "common/api/api_messages.h"
#include "common/options_switches.h" #include "common/options_switches.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
@ -153,6 +154,10 @@ void NativeWindow::BlurWebView() {
GetWebContents()->GetRenderViewHost()->Blur(); GetWebContents()->GetRenderViewHost()->Blur();
} }
bool NativeWindow::IsWebViewFocused() {
return GetWebContents()->GetRenderViewHost()->GetView()->HasFocus();
}
void NativeWindow::RestartHangMonitorTimeout() { void NativeWindow::RestartHangMonitorTimeout() {
GetWebContents()->GetRenderViewHost()->RestartHangMonitorTimeout(); GetWebContents()->GetRenderViewHost()->RestartHangMonitorTimeout();
} }

1
browser/native_window.h
View file

@ -96,6 +96,7 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void InspectElement(int x, int y); virtual void InspectElement(int x, int y);
virtual void FocusOnWebView(); virtual void FocusOnWebView();
virtual void BlurWebView(); virtual void BlurWebView();
virtual bool IsWebViewFocused();
virtual void RestartHangMonitorTimeout(); virtual void RestartHangMonitorTimeout();
// The same with closing a tab in a real browser. // The same with closing a tab in a real browser.