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

Add BrowserWindow.isFocused() API.

Browse source
This commit is contained in:
Cheng Zhao 2013-05-16 22:56:52 +08:00
parent eec8abf397
commit 5c3857790c
5 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
browser/api/atom_api_window.cc
View file

@ -116,6 +116,12 @@ v8::Handle<v8::Value> Window::Focus(const v8::Arguments &args) {
return v8::Undefined(); return v8::Undefined();
} }
// static
v8::Handle<v8::Value> Window::IsFocused(const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK;
return v8::Boolean::New(self->window_->IsFocused());
}
// static // static
v8::Handle<v8::Value> Window::Show(const v8::Arguments &args) { v8::Handle<v8::Value> Window::Show(const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK; UNWRAP_WINDOW_AND_CHECK;
@ -591,6 +597,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy); NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy);
NODE_SET_PROTOTYPE_METHOD(t, "close", Close); NODE_SET_PROTOTYPE_METHOD(t, "close", Close);
NODE_SET_PROTOTYPE_METHOD(t, "focus", Focus); NODE_SET_PROTOTYPE_METHOD(t, "focus", Focus);
NODE_SET_PROTOTYPE_METHOD(t, "isFocused", IsFocused);
NODE_SET_PROTOTYPE_METHOD(t, "show", Show); NODE_SET_PROTOTYPE_METHOD(t, "show", Show);
NODE_SET_PROTOTYPE_METHOD(t, "hide", Hide); NODE_SET_PROTOTYPE_METHOD(t, "hide", Hide);
NODE_SET_PROTOTYPE_METHOD(t, "maximize", Maximize); NODE_SET_PROTOTYPE_METHOD(t, "maximize", Maximize);

1
browser/api/atom_api_window.h
View file

@ -45,6 +45,7 @@ class Window : public EventEmitter,
// APIs for NativeWindow. // APIs for NativeWindow.
static v8::Handle<v8::Value> Close(const v8::Arguments &args); static v8::Handle<v8::Value> Close(const v8::Arguments &args);
static v8::Handle<v8::Value> Focus(const v8::Arguments &args); static v8::Handle<v8::Value> Focus(const v8::Arguments &args);
static v8::Handle<v8::Value> IsFocused(const v8::Arguments &args);
static v8::Handle<v8::Value> Show(const v8::Arguments &args); static v8::Handle<v8::Value> Show(const v8::Arguments &args);
static v8::Handle<v8::Value> Hide(const v8::Arguments &args); static v8::Handle<v8::Value> Hide(const v8::Arguments &args);
static v8::Handle<v8::Value> Maximize(const v8::Arguments &args); static v8::Handle<v8::Value> Maximize(const v8::Arguments &args);

1
browser/native_window.h
View file

@ -63,6 +63,7 @@ class NativeWindow : public content::WebContentsDelegate,
virtual void CloseImmediately() = 0; virtual void CloseImmediately() = 0;
virtual void Move(const gfx::Rect& pos) = 0; virtual void Move(const gfx::Rect& pos) = 0;
virtual void Focus(bool focus) = 0; virtual void Focus(bool focus) = 0;
virtual bool IsFocused() = 0;
virtual void Show() = 0; virtual void Show() = 0;
virtual void Hide() = 0; virtual void Hide() = 0;
virtual void Maximize() = 0; virtual void Maximize() = 0;

1
browser/native_window_mac.h
View file

@ -23,6 +23,7 @@ class NativeWindowMac : public NativeWindow {
virtual void CloseImmediately() OVERRIDE; virtual void CloseImmediately() OVERRIDE;
virtual void Move(const gfx::Rect& pos) OVERRIDE; virtual void Move(const gfx::Rect& pos) OVERRIDE;
virtual void Focus(bool focus) OVERRIDE; virtual void Focus(bool focus) OVERRIDE;
virtual bool IsFocused() OVERRIDE;
virtual void Show() OVERRIDE; virtual void Show() OVERRIDE;
virtual void Hide() OVERRIDE; virtual void Hide() OVERRIDE;
virtual void Maximize() OVERRIDE; virtual void Maximize() OVERRIDE;

4
browser/native_window_mac.mm
View file

@ -151,6 +151,10 @@ void NativeWindowMac::Focus(bool focus) {
[window() orderBack:nil]; [window() orderBack:nil];
} }
bool NativeWindowMac::IsFocused() {
return [window() isKeyWindow];
}
void NativeWindowMac::Show() { void NativeWindowMac::Show() {
[window() makeKeyAndOrderFront:nil]; [window() makeKeyAndOrderFront:nil];
} }