github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: fullscreen for windows without rounded corners (#47664)

Browse Source
This commit is contained in:
Shelley Vohr
2025-07-08 11:14:14 +02:00
committed by GitHub
parent 5ef6897bc7
commit 03a02fc31e
6 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/browser/ui/cocoa/electron_ns_window.mm
View File

@@ -375,9 +375,6 @@ void SwizzleSwipeWithEvent(NSView* view, SEL swiz_selector) {
}
- (BOOL)toggleFullScreenMode:(id)sender {
if (!shell_->has_frame() && !shell_->HasStyleMask(NSWindowStyleMaskTitled))
return NO;
bool is_simple_fs = shell_->IsSimpleFullScreen();
bool always_simple_fs = shell_->always_simple_fullscreen();

2
shell/browser/ui/cocoa/electron_ns_window_delegate.h
View File

@@ -24,6 +24,8 @@ class NativeWindowMac;
int level_;
bool is_resizable_;
bool is_borderless_;
// Whether the window is currently minimized. Used to work
// around a macOS bug with child window minimization.
bool is_minimized_;

5
shell/browser/ui/cocoa/electron_ns_window_delegate.mm
View File

@@ -299,6 +299,8 @@ using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
- (void)windowWillEnterFullScreen:(NSNotification*)notification {
// Store resizable mask so it can be restored after exiting fullscreen.
is_resizable_ = shell_->HasStyleMask(NSWindowStyleMaskResizable);
// Store borderless mask so it can be restored after exiting fullscreen.
is_borderless_ = !shell_->HasStyleMask(NSWindowStyleMaskTitled);
shell_->set_is_transitioning_fullscreen(true);
@@ -306,6 +308,8 @@ using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
// Set resizable to true before entering fullscreen.
shell_->SetResizable(true);
// Set borderless to false before entering fullscreen.
shell_->SetBorderless(false);
}
- (void)windowDidEnterFullScreen:(NSNotification*)notification {
@@ -341,6 +345,7 @@ using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
shell_->set_is_transitioning_fullscreen(false);
shell_->SetResizable(is_resizable_);
shell_->SetBorderless(is_borderless_);
shell_->NotifyWindowLeaveFullScreen();
if (shell_->HandleDeferredClose())