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

mac: Make sure web view is the first responder of window, fixes #382.

Browse source
This commit is contained in:
Cheng Zhao 2014-06-11 15:57:40 +08:00
parent 4aa217970e
commit b431566421
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_mac.mm
View file

@ -29,6 +29,7 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
@private @private
atom::NativeWindowMac* shell_; atom::NativeWindowMac* shell_;
BOOL acceptsFirstMouse_; BOOL acceptsFirstMouse_;
BOOL hasSetInitialFocus_;
} }
- (id)initWithShell:(atom::NativeWindowMac*)shell; - (id)initWithShell:(atom::NativeWindowMac*)shell;
- (void)setAcceptsFirstMouse:(BOOL)accept; - (void)setAcceptsFirstMouse:(BOOL)accept;
@ -40,6 +41,7 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
if ((self = [super init])) { if ((self = [super init])) {
shell_ = shell; shell_ = shell;
acceptsFirstMouse_ = NO; acceptsFirstMouse_ = NO;
hasSetInitialFocus_ = NO;
} }
return self; return self;
} }
@ -50,6 +52,12 @@ static const CGFloat kAtomWindowCornerRadius = 4.0;
- (void)windowDidBecomeMain:(NSNotification*)notification { - (void)windowDidBecomeMain:(NSNotification*)notification {
shell_->NotifyWindowFocus(); shell_->NotifyWindowFocus();
// Make sure the web view is the first responder of the window.
if (!hasSetInitialFocus_) {
shell_->GetWebContents()->GetView()->Focus();
hasSetInitialFocus_ = YES;
}
} }
- (void)windowDidResignMain:(NSNotification*)notification { - (void)windowDidResignMain:(NSNotification*)notification {