fix: window with CustomButtonsOnHover should have rounded corner (#26901

)
electron · Dec 11, 2020 · 28ae68d · 28ae68d
1 parent b4c1e54
commit 28ae68d
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -392,10 +392,6 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   }
 
   NSUInteger styleMask = NSWindowStyleMaskTitled;
-  bool customOnHover = title_bar_style_ == TitleBarStyle::kCustomButtonsOnHover;
-  if (customOnHover && (!useStandardWindow || transparent() || !has_frame()))
-    styleMask = NSWindowStyleMaskFullSizeContentView;
-
   if (minimizable)
     styleMask |= NSMiniaturizableWindowMask;
   if (closable)
@@ -1697,24 +1693,22 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
     // The fullscreen button should always be hidden for frameless window.
     [[window_ standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
 
+    // Create a custom window buttons view for kCustomButtonsOnHover.
     if (title_bar_style_ == TitleBarStyle::kCustomButtonsOnHover) {
       buttons_view_.reset(
           [[CustomWindowButtonView alloc] initWithFrame:NSZeroRect]);
 
-      // NSWindowStyleMaskFullSizeContentView does not work with zoom button
-      SetFullScreenable(false);
-
       if (!minimizable)
         [[buttons_view_ viewWithTag:2] removeFromSuperview];
       if (!closable)
         [[buttons_view_ viewWithTag:1] removeFromSuperview];
 
       [[window_ contentView] addSubview:buttons_view_];
-    } else {
-      if (title_bar_style_ != TitleBarStyle::kNormal)
-        return;
+    }
 
-      // Hide the window buttons.
+    // Hide the window buttons except for kHidden and kHiddenInset.
+    if (title_bar_style_ == TitleBarStyle::kNormal ||
+        title_bar_style_ == TitleBarStyle::kCustomButtonsOnHover) {
       [[window_ standardWindowButton:NSWindowZoomButton] setHidden:YES];
       [[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
       [[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];