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

mac: Correctly unload previous content view

Browse source
This commit is contained in:
Cheng Zhao 2018-04-10 16:49:22 +09:00
parent 56735d4ff5
commit cfd8ea8eb0
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/native_window_mac.mm
View file

@ -986,9 +986,15 @@ NativeWindowMac::~NativeWindowMac() {
void NativeWindowMac::SetContentView( void NativeWindowMac::SetContentView(
brightray::InspectableWebContents* web_contents) { brightray::InspectableWebContents* web_contents) {
// TODO(zcbenz): Uninstall view first. // We might have vibrantView added to the contentView.
// TODO(zcbenz): Handle vibrancy. NSArray* subviews = [[window_ contentView] subviews];
// TODO(zcbenz): Handle draggable regions. if ([subviews count] == ([window_ vibrantView] != nil ? 2 : 1)) {
// The vibrantView is always bellow the web view.
NSView* content_view = static_cast<NSView*>(
[subviews objectAtIndex:([subviews count] - 1)]);
[content_view removeFromSuperview];
}
NSView* view = web_contents->GetView()->GetNativeView(); NSView* view = web_contents->GetView()->GetNativeView();
[view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
InstallView(web_contents->GetView()->GetNativeView()); InstallView(web_contents->GetView()->GetNativeView());