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

Support undocking the devtools view into its own window

Browse source
This commit is contained in:
Adam Roben 2013-03-27 12:15:46 -04:00
parent c22d1cca79
commit fa9a1d7b35
2 changed files with 66 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/mac/bry_inspectable_web_contents_view.h
View file

@ -2,7 +2,7 @@
@class BRYInspectableWebContentsViewPrivate; @class BRYInspectableWebContentsViewPrivate;
@interface BRYInspectableWebContentsView : NSView { @interface BRYInspectableWebContentsView : NSView <NSWindowDelegate> {
@private @private
BRYInspectableWebContentsViewPrivate *_private; BRYInspectableWebContentsViewPrivate *_private;
} }

66
brightray/browser/mac/bry_inspectable_web_contents_view.mm
View file

@ -12,9 +12,19 @@ using namespace brightray;
@public @public
InspectableWebContentsViewMac *inspectableWebContentsView; InspectableWebContentsViewMac *inspectableWebContentsView;
NSSplitView *splitView; NSSplitView *splitView;
NSWindow *window;
} }
@end @end
namespace {
NSRect devtoolsWindowFrame(NSView *referenceView) {
auto screenFrame = [referenceView.window convertRectToScreen:[referenceView convertRect:referenceView.bounds toView:nil]];
return NSInsetRect(screenFrame, NSWidth(screenFrame) / 6, NSHeight(screenFrame) / 6);
}
}
@implementation BRYInspectableWebContentsView @implementation BRYInspectableWebContentsView
- (instancetype)initWithInspectableWebContentsViewMac:(InspectableWebContentsViewMac *)inspectableWebContentsView { - (instancetype)initWithInspectableWebContentsViewMac:(InspectableWebContentsViewMac *)inspectableWebContentsView {
@ -35,6 +45,7 @@ using namespace brightray;
} }
- (void)dealloc { - (void)dealloc {
[_private->window release];
[_private->splitView release]; [_private->splitView release];
[_private release]; [_private release];
_private = nil; _private = nil;
@ -54,6 +65,15 @@ using namespace brightray;
auto devToolsWebContents = _private->inspectableWebContentsView->inspectable_web_contents()->devtools_web_contents(); auto devToolsWebContents = _private->inspectableWebContentsView->inspectable_web_contents()->devtools_web_contents();
auto devToolsView = devToolsWebContents->GetView()->GetNativeView(); auto devToolsView = devToolsWebContents->GetView()->GetNativeView();
if (_private->window && devToolsView.window == _private->window) {
if (visible) {
[_private->window makeKeyAndOrderFront:nil];
} else {
[_private->window orderOut:nil];
}
return;
}
if (visible) { if (visible) {
auto inspectedView = _private->inspectableWebContentsView->inspectable_web_contents()->GetWebContents()->GetView()->GetNativeView(); auto inspectedView = _private->inspectableWebContentsView->inspectable_web_contents()->GetWebContents()->GetView()->GetNativeView();
CGRect frame = NSRectToCGRect(inspectedView.frame); CGRect frame = NSRectToCGRect(inspectedView.frame);
@ -75,16 +95,60 @@ using namespace brightray;
- (BOOL)setDockSide:(const std::string&)side { - (BOOL)setDockSide:(const std::string&)side {
if (side == "right") { if (side == "right") {
_private->splitView.vertical = YES; _private->splitView.vertical = YES;
[self moveToSplitView];
} else if (side == "bottom") { } else if (side == "bottom") {
_private->splitView.vertical = NO; _private->splitView.vertical = NO;
[self moveToSplitView];
} else if (side == "undocked") {
[self moveToWindow];
} else { } else {
return NO; return NO;
} }
[_private->splitView adjustSubviews];
return YES; return YES;
} }
- (void)moveToWindow {
if (!_private->window) {
auto styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask | NSTexturedBackgroundWindowMask | NSUnifiedTitleAndToolbarWindowMask;
auto contentRect = [NSWindow contentRectForFrameRect:devtoolsWindowFrame(_private->splitView) styleMask:styleMask];
_private->window = [[NSWindow alloc] initWithContentRect:contentRect styleMask:styleMask backing:NSBackingStoreBuffered defer:YES];
_private->window.delegate = self;
_private->window.releasedWhenClosed = NO;
_private->window.title = @"Developer Tools";
[_private->window setAutorecalculatesContentBorderThickness:NO forEdge:NSMaxYEdge];
[_private->window setContentBorderThickness:24 forEdge:NSMaxYEdge];
}
auto devToolsWebContents = _private->inspectableWebContentsView->inspectable_web_contents()->devtools_web_contents();
auto devToolsView = devToolsWebContents->GetView()->GetNativeView();
NSView *contentView = _private->window.contentView;
devToolsView.frame = contentView.bounds;
devToolsView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
[contentView addSubview:devToolsView];
[_private->window makeKeyAndOrderFront:nil];
[_private->splitView adjustSubviews];
}
- (void)moveToSplitView {
[_private->window orderOut:nil];
auto devToolsWebContents = _private->inspectableWebContentsView->inspectable_web_contents()->devtools_web_contents();
auto devToolsView = devToolsWebContents->GetView()->GetNativeView();
[_private->splitView addSubview:devToolsView];
[_private->splitView adjustSubviews];
}
#pragma mark - NSWindowDelegate
- (BOOL)windowShouldClose:(id)sender {
[_private->window orderOut:nil];
return NO;
}
@end @end
@implementation BRYInspectableWebContentsViewPrivate @implementation BRYInspectableWebContentsViewPrivate