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

Styling fixes

Browse source
This commit is contained in:
Cheng Zhao 2017-09-14 14:43:22 +09:00
parent 0d69738bd6
commit 19a7c7ac39
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
atom/browser/native_window_mac.mm
View file

@ -1085,7 +1085,7 @@ void NativeWindowMac::Show() {
completionHandler:^(NSModalResponse) {}]; completionHandler:^(NSModalResponse) {}];
return; return;
} }
// Reattach the window to the parent to actually show it. // Reattach the window to the parent to actually show it.
if (parent()) if (parent())
InternalSetParentWindow(parent(), true); InternalSetParentWindow(parent(), true);
@ -1101,7 +1101,7 @@ void NativeWindowMac::ShowInactive() {
// Reattach the window to the parent to actually show it. // Reattach the window to the parent to actually show it.
if (parent()) if (parent())
InternalSetParentWindow(parent(), true); InternalSetParentWindow(parent(), true);
[window_ orderFrontRegardless]; [window_ orderFrontRegardless];
} }
@ -1111,7 +1111,7 @@ void NativeWindowMac::Hide() {
[parent()->GetNativeWindow() endSheet:window_]; [parent()->GetNativeWindow() endSheet:window_];
return; return;
} }
// Deattach the window from the parent before. // Deattach the window from the parent before.
if (parent()) if (parent())
InternalSetParentWindow(parent(), false); InternalSetParentWindow(parent(), false);
@ -1548,26 +1548,6 @@ void NativeWindowMac::SetBrowserView(NativeBrowserView* browser_view) {
native_view.hidden = NO; native_view.hidden = NO;
} }
void NativeWindowMac::InternalSetParentWindow(NativeWindow* parent, bool attach) {
if (is_modal())
return;
NativeWindow::SetParentWindow(parent);
// Do not remove/add if we are already properly attached.
if (attach && parent && [window_ parentWindow] == parent->GetNativeWindow())
return;
// Remove current parent window.
if ([window_ parentWindow])
[[window_ parentWindow] removeChildWindow:window_];
// Set new parent window.
// Note that this method will force the window to become visible.
if (parent && attach)
[parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
}
void NativeWindowMac::SetParentWindow(NativeWindow* parent) { void NativeWindowMac::SetParentWindow(NativeWindow* parent) {
InternalSetParentWindow(parent, IsVisible()); InternalSetParentWindow(parent, IsVisible());
} }
@ -1576,7 +1556,7 @@ gfx::NativeView NativeWindowMac::GetNativeView() const {
return inspectable_web_contents()->GetView()->GetNativeView(); return inspectable_web_contents()->GetView()->GetNativeView();
} }
gfx::NativeWindow NativeWindowMac::GetNativeWindow() { gfx::NativeWindow NativeWindowMac::GetNativeWindow() const {
return window_; return window_;
} }
@ -1818,6 +1798,26 @@ void NativeWindowMac::UpdateDraggableRegions(
UpdateDraggableRegionViews(regions); UpdateDraggableRegionViews(regions);
} }
void NativeWindowMac::InternalSetParentWindow(NativeWindow* parent, bool attach) {
if (is_modal())
return;
NativeWindow::SetParentWindow(parent);
// Do not remove/add if we are already properly attached.
if (attach && parent && [window_ parentWindow] == parent->GetNativeWindow())
return;
// Remove current parent window.
if ([window_ parentWindow])
[[window_ parentWindow] removeChildWindow:window_];
// Set new parent window.
// Note that this method will force the window to become visible.
if (parent && attach)
[parent->GetNativeWindow() addChildWindow:window_ ordered:NSWindowAbove];
}
void NativeWindowMac::ShowWindowButton(NSWindowButton button) { void NativeWindowMac::ShowWindowButton(NSWindowButton button) {
auto view = [window_ standardWindowButton:button]; auto view = [window_ standardWindowButton:button];
[view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil]; [view.superview addSubview:view positioned:NSWindowAbove relativeTo:nil];