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

fix: traffic lights not working when child windows are restored via parent window (#39244)

Browse Source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot]
2023-07-26 13:49:52 +02:00
committed by GitHub
parent db7acc9fc0
commit b5c8af02f5
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,10 @@ class NativeWindowMac;
int level_;
bool is_resizable_;
// Whether the window is currently minimized. Used to work
// around a macOS bug with child window minimization.
bool is_minimized_;
// Only valid during a live resize.
// Used to keep track of whether a resize is happening horizontally or
// vertically, even if physically the user is resizing in both directions.

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

@@ -51,10 +51,22 @@ using FullScreenTransitionState =
// check occlusion binary flag
if (window.occlusionState & NSWindowOcclusionStateVisible) {
// The app is visible
// There's a macOS bug where if a child window is minimized, and then both
// windows are restored via activation of the parent window, the child
// window is not properly deminiaturized. This causes traffic light bugs
// like the close and miniaturize buttons having no effect. We need to call
// deminiaturize on the child window to fix this. Unfortunately, this also
// hits ANOTHER bug where even after calling deminiaturize,
// windowDidDeminiaturize is not posted on the child window if it was
// incidentally restored by the parent, so we need to manually reset
// is_minimized_ here.
if (shell_->parent() && is_minimized_) {
shell_->Restore();
is_minimized_ = false;
}
shell_->NotifyWindowShow();
} else {
// The app is not visible
shell_->NotifyWindowHide();
}
}
@@ -244,11 +256,15 @@ using FullScreenTransitionState =
- (void)windowDidMiniaturize:(NSNotification*)notification {
[super windowDidMiniaturize:notification];
is_minimized_ = true;
shell_->NotifyWindowMinimize();
}
- (void)windowDidDeminiaturize:(NSNotification*)notification {
[super windowDidDeminiaturize:notification];
is_minimized_ = false;
shell_->AttachChildren();
shell_->SetWindowLevel(level_);
shell_->NotifyWindowRestore();