fix: child window alwaysOnTop level

electron · Jun 21, 2021 · 44cbc42 · 44cbc42
1 parent 507cbdc
commit 44cbc42
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -1805,10 +1805,15 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 
   // Set new parent window.
   // Note that this method will force the window to become visible.
-  if (parent && attach)
+  if (parent && attach) {
+    // Attaching a window as a child window resets its window level, so
+    // save and restore it afterwards.
+    NSInteger level = window_.level;
     [parent->GetNativeWindow().GetNativeNSWindow()
         addChildWindow:window_
                ordered:NSWindowAbove];
+    [window_ setLevel:level];
+  }
 }
 
 void NativeWindowMac::SetForwardMouseMessages(bool forward) {