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

feat: add activate option to webContents.openDevTools (#13852)

Browse source
This commit is contained in:
Milan Burda 2018-11-27 10:34:44 +01:00 • committed by Cheng Zhao
parent aafbd865bf
commit d63a848011
13 changed files with 63 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/ui/cocoa/atom_inspectable_web_contents_view.h
View file

@ -34,10 +34,10 @@ using atom::InspectableWebContentsViewMac;
(InspectableWebContentsViewMac*)view;
- (void)removeObservers;
- (void)notifyDevToolsFocused;
- (void)setDevToolsVisible:(BOOL)visible;
- (void)setDevToolsVisible:(BOOL)visible activate:(BOOL)activate;
- (BOOL)isDevToolsVisible;
- (BOOL)isDevToolsFocused;
- (void)setIsDocked:(BOOL)docked;
- (void)setIsDocked:(BOOL)docked activate:(BOOL)activate;
- (void)setContentsResizingStrategy:
(const DevToolsContentsResizingStrategy&)strategy;
- (void)setTitle:(NSString*)title;

16
atom/browser/ui/cocoa/atom_inspectable_web_contents_view.mm
View file

@ -63,7 +63,7 @@
}
- (IBAction)showDevTools:(id)sender {
inspectableWebContentsView_->inspectable_web_contents()->ShowDevTools();
inspectableWebContentsView_->inspectable_web_contents()->ShowDevTools(true);
}
- (void)notifyDevToolsFocused {
@ -71,7 +71,7 @@
inspectableWebContentsView_->GetDelegate()->DevToolsFocused();
}
- (void)setDevToolsVisible:(BOOL)visible {
- (void)setDevToolsVisible:(BOOL)visible activate:(BOOL)activate {
if (visible == devtools_visible_)
return;
@ -106,7 +106,11 @@
}
} else {
if (visible) {
[devtools_window_ makeKeyAndOrderFront:nil];
if (activate) {
[devtools_window_ makeKeyAndOrderFront:nil];
} else {
[devtools_window_ orderBack:nil];
}
} else {
[devtools_window_ setDelegate:nil];
[devtools_window_ close];
@ -127,9 +131,9 @@
}
}
- (void)setIsDocked:(BOOL)docked {
- (void)setIsDocked:(BOOL)docked activate:(BOOL)activate {
// Revert to no-devtools state.
[self setDevToolsVisible:NO];
[self setDevToolsVisible:NO activate:NO];
// Switch to new state.
devtools_docked_ = docked;
@ -163,7 +167,7 @@
[contentView addSubview:devToolsView];
}
[self setDevToolsVisible:YES];
[self setDevToolsVisible:YES activate:activate];
}
- (void)setContentsResizingStrategy: