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

Use new devtools structure in brightray.

Browse source 
Fixes #210.
Fixes #275.
This commit is contained in:
Cheng Zhao 2014-07-02 16:38:11 +08:00
parent 2cc2fd03fa
commit 949821f255
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom.gyp
View file

@ -675,6 +675,7 @@
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Carbon.framework', '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
'external_binaries/Squirrel.framework', 'external_binaries/Squirrel.framework',
'external_binaries/ReactiveCocoa.framework', 'external_binaries/ReactiveCocoa.framework',
'external_binaries/Mantle.framework', 'external_binaries/Mantle.framework',

11
atom/browser/native_window.cc
View file

@ -70,12 +70,6 @@ NativeWindow::NativeWindow(content::WebContents* web_contents,
brightray::InspectableWebContents::Create(web_contents)) { brightray::InspectableWebContents::Create(web_contents)) {
options.Get(switches::kFrame, &has_frame_); options.Get(switches::kFrame, &has_frame_);
#if defined(OS_MACOSX)
// Temporary fix for flashing devtools, try removing this after upgraded to
// Chrome 32.
web_contents->GetView()->SetAllowOverlappingViews(false);
#endif
// Read icon before window is created. // Read icon before window is created.
gfx::ImageSkia icon; gfx::ImageSkia icon;
if (options.Get(switches::kIcon, &icon)) if (options.Get(switches::kIcon, &icon))
@ -209,11 +203,6 @@ bool NativeWindow::HasModalDialog() {
void NativeWindow::OpenDevTools() { void NativeWindow::OpenDevTools() {
inspectable_web_contents()->ShowDevTools(); inspectable_web_contents()->ShowDevTools();
#if defined(OS_MACOSX)
// Temporary fix for flashing devtools, try removing this after upgraded to
// Chrome 32.
GetDevToolsWebContents()->GetView()->SetAllowOverlappingViews(false);
#endif
} }
void NativeWindow::CloseDevTools() { void NativeWindow::CloseDevTools() {

6
atom/browser/native_window_mac.mm
View file

@ -520,6 +520,12 @@ void NativeWindowMac::HandleKeyboardEvent(
void NativeWindowMac::InstallView() { void NativeWindowMac::InstallView() {
NSView* view = inspectable_web_contents()->GetView()->GetNativeView(); NSView* view = inspectable_web_contents()->GetView()->GetNativeView();
if (has_frame_) { if (has_frame_) {
// Add layer with white background for the contents view.
base::scoped_nsobject<CALayer> layer([[CALayer alloc] init]);
[layer setBackgroundColor:CGColorGetConstantColor(kCGColorWhite)];
[view setLayer:layer];
[view setWantsLayer:YES];
[view setFrame:[[window_ contentView] bounds]]; [view setFrame:[[window_ contentView] bounds]];
[[window_ contentView] addSubview:view]; [[window_ contentView] addSubview:view];
} else { } else {

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit d8f87871bab2ed0ef5bc6513dbbe5c83ddbfbf47 Subproject commit 1e41ef63ebd7ecb1ffb3a6fec74b5a5264f20092