mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 146.0.7652.0 * fix(patch-conflict): update mas_avoid_private_macos_api_usage context for constrainFrameRect method The upstream CL added a new constrainFrameRect:toScreen: method override to NativeWidgetMacNSWindow as part of headless mode window zoom implementation. The MAS patch's #endif for frameViewClassForStyleMask now correctly appears after that method, since constrainFrameRect is a public API override that doesn't need to be guarded. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7487666 * fix(patch-conflict): update printing.patch for base::DictValue rename Updated printing.patch to use the new base::DictValue type name instead of base::Value::Dict following Chromium's type renaming change. This affects CompleteUpdatePrintSettings() signature and related code. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * fix(patch-conflict): update accessibility_ui patch for base::DictValue/ListValue rename Updated adjust_accessibility_ui_for_electron.patch to use the new base::DictValue and base::ListValue type names instead of base::Value::Dict and base::Value::List following Chromium's type renaming change. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509820 * chore: update patches * 6625736: Rename DURABLE_STORAGE to PERSISTENT_STORAGE for consistency | https://chromium-review.googlesource.com/c/chromium/src/+/6625736 * chore: bump chromium in DEPS to 146.0.7653.0 * chore: update patches * 7000847: add type tag to v8::External for gin_helper function templates The upstream gin function templates now use v8::ExternalPointerTypeTag for type safety when using v8::External. Updated Electron's forked gin_helper function template to use the same kGinInternalCallbackHolderBaseTag that Chromium's gin uses. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * fix(patch-update): extend V8 Object API deprecation patch for Node.js Extended the existing patch to cover additional files that use GetAlignedPointerFromInternalField and SetAlignedPointerInInternalField: - src/stream_base-inl.h - src/udp_wrap.cc - src/js_udp_wrap.cc - src/node_process_methods.cc - src/node_snapshotable.cc - src/base_object.cc These APIs now require an EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * 7000847: add type tag to v8::External calls in shared_texture Updated v8::External::New and v8::External::Value calls to use the kExternalPointerTypeTagDefault tag as required by the V8 API change that deprecates the tagless versions. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7000847 * 7508687: use ChildProcessId for file permission APIs The ChildProcessSecurityPolicy::CanReadFile and GrantReadFile APIs now require ChildProcessId instead of int. Updated to use GetID() instead of GetDeprecatedID() for these specific calls. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7508687 * 7000847: add type tag to v8::External calls in callback and osr_converter The v8::External API now requires an EmbedderPointerTypeTag parameter for both New() and Value() methods to improve V8 sandbox type safety. Updated calls in: - callback.cc: TranslatorHolder constructor and CallTranslator - osr_converter.cc: OffscreenSharedTextureValue converter Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7000847 * fixup! 7087956: [api] Promote deprecation of v8::Context and v8::Object API methods Extended the Node.js patch to cover histogram.cc which also uses SetAlignedPointerInInternalField and GetAlignedPointerFromInternalField APIs that now require the EmbedderDataTypeTag parameter. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7087956 * chore: bump chromium in DEPS to 146.0.7655.0 * chore: update patches * 7509043: update WebSpellingMarker type for API change The upstream Chromium API changed - WebSpellingMarker was moved from a nested type within WebTextCheckClient to a standalone type in the blink namespace. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7509043 * 7498491: update process_id to use OriginatingProcess type The upstream Chromium API changed - URLLoaderFactoryParams::process_id was changed from an integer to a union type network::OriginatingProcess that distinguishes between browser and renderer processes. - For browser process requests, use OriginatingProcess::browser() - For renderer process lookups, check !is_browser() and use renderer_process().value() to get the child_id Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7498491 * 5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception | https://chromium-review.googlesource.com/c/chromium/src/+/5710330 5710330 added a new NSNextStepFrame interface extension and implementations for NativeWidgetMacNSWindowTitledFrame and NativeWidgetMacNSWindowBorderlessFrame. These use private macOS APIs that are not available in Mac App Store builds. * chore: update patches * chore: bump chromium in DEPS to 146.0.7661.0 * chore: bump chromium in DEPS to 146.0.7663.0 * fix(patch-conflict): update accessibility_ui for string_view API change Upstream removed redundant std::string(default_api_type) conversion as part of a string_view optimization cleanup. Updated patch context to match. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7514107 * fix(patch-conflict): update service process launch options for sandbox API refactor Upstream removed content/common/sandbox_init_win.cc and content/public/common/sandbox_init_win.h, moving the functionality directly into ChildProcessLauncherHelper. Updated patch to call sandbox::policy::SandboxWin::StartSandboxedProcess directly with the LaunchOptions pointer instead of going through the removed helper. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7528253 * fix(patch-conflict): update MAS safestorage for keychain API refactor Upstream refactored KeychainPassword::GetPassword() to use a new GetPasswordImpl() helper function with improved error tracking via base::expected<std::string, OSStatus>. Adapted patch to use the new GetPasswordImpl with the suffixed account name and handle migration from legacy accounts through the new API. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7516438 * chore: update patches * chore: bump chromium in DEPS to 146.0.7663.0 * fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: include new cookie exclusion reason https://chromium-review.googlesource.com/c/chromium/src/+/7486527 * fix: enable libc++ ABI flag for trivially copyable std::vector<bool> Required for changes introduced in the following CL https://chromium-review.googlesource.com/c/chromium/src/+/7513653 * fixup! fix: base::Value::Dict -> base::DictValue https://chromium-review.googlesource.com/c/chromium/src/+/7513889 * fix: spellcheck not working in tests https://chromium-review.googlesource.com/c/chromium/src/+/7452579 * fix: cookie test failing due to multiple rejection reasons https://chromium-review.googlesource.com/c/chromium/src/+/7506629 * fix: macos sizing unmaximized window incorrectly https://chromium-review.googlesource.com/c/chromium/src/+/7487666 Changes to headless mode caused the unmaximized window to subtract the height of the menubar. * fix: skip tests for incompatible BoringSSL ML-DSA crypto https://boringssl-review.googlesource.com/c/boringssl/+/84929 * test: fix pseudonymization registration in utility process on Linux Ref: 7486913: Pass pseudonymization salt via shared memory at process launch | https://chromium-review.googlesource.com/c/chromium/src/+/7486913 * fix: restore MAS patch-outs Restores some `#if !IS_MAS_BUILD()` gates dropped in773054ad59* fixup! 7508687: use ChildProcessId for file permission APIs * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor * chore: add note about parallel upstream change * fixup! Merge remote-tracking branch 'origin/main' into roller/chromium/main * Revert "fixup! 7508687: use ChildProcessId for file permission APIs" This reverts commit05c43e4e5d. The _impl version has the signature, but not the public interface. :oof: * fixup! fix(patch-conflict): update MAS safestorage for keychain API refactor --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Samuel Maddock <samuelmaddock@electronjs.org> Co-authored-by: clavin <clavin@electronjs.org>
425 lines
14 KiB
Plaintext
425 lines
14 KiB
Plaintext
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/cocoa/electron_ns_window.h"
|
|
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "electron/mas.h"
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
|
#include "shell/browser/native_window_mac.h"
|
|
#include "shell/browser/ui/cocoa/electron_preview_item.h"
|
|
#include "shell/browser/ui/cocoa/electron_touch_bar.h"
|
|
#include "shell/browser/ui/cocoa/root_view_mac.h"
|
|
#include "ui/base/cocoa/window_size_constants.h"
|
|
|
|
#import <objc/message.h>
|
|
#import <objc/runtime.h>
|
|
|
|
using namespace std::string_view_literals;
|
|
|
|
namespace electron {
|
|
|
|
int ScopedDisableResize::disable_resize_ = 0;
|
|
|
|
} // namespace electron
|
|
|
|
@interface NSWindow (PrivateAPI)
|
|
- (int64_t)_resizeDirectionForMouseLocation:(CGPoint)location;
|
|
@end
|
|
|
|
// See components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
|
@interface NSView (CRFrameViewAdditions)
|
|
- (void)cr_mouseDownOnFrameView:(NSEvent*)event;
|
|
@end
|
|
|
|
typedef void (*MouseDownImpl)(id, SEL, NSEvent*);
|
|
|
|
namespace {
|
|
MouseDownImpl g_nsthemeframe_mousedown;
|
|
MouseDownImpl g_nsnextstepframe_mousedown;
|
|
} // namespace
|
|
|
|
// This class is never instantiated, it's just a container for our swizzled
|
|
// mouseDown method.
|
|
@interface SwizzledMethodsClass : NSView
|
|
@end
|
|
|
|
@implementation SwizzledMethodsClass
|
|
- (void)swiz_nsthemeframe_mouseDown:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell && !shell->has_frame())
|
|
[self cr_mouseDownOnFrameView:event];
|
|
g_nsthemeframe_mousedown(self, @selector(mouseDown:), event);
|
|
}
|
|
}
|
|
|
|
- (void)swiz_nsnextstepframe_mouseDown:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell && !shell->has_frame()) {
|
|
[self cr_mouseDownOnFrameView:event];
|
|
}
|
|
g_nsnextstepframe_mousedown(self, @selector(mouseDown:), event);
|
|
}
|
|
}
|
|
|
|
- (void)swiz_nsview_swipeWithEvent:(NSEvent*)event {
|
|
if ([self.window respondsToSelector:@selector(shell)]) {
|
|
electron::NativeWindowMac* shell =
|
|
(electron::NativeWindowMac*)[(id)self.window shell];
|
|
if (shell) {
|
|
if (event.deltaY == 1.0) {
|
|
shell->NotifyWindowSwipe("up");
|
|
} else if (event.deltaX == -1.0) {
|
|
shell->NotifyWindowSwipe("right");
|
|
} else if (event.deltaY == -1.0) {
|
|
shell->NotifyWindowSwipe("down");
|
|
} else if (event.deltaX == 1.0) {
|
|
shell->NotifyWindowSwipe("left");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@end
|
|
|
|
namespace {
|
|
#if IS_MAS_BUILD()
|
|
void SwizzleMouseDown(NSView* frame_view,
|
|
SEL swiz_selector,
|
|
MouseDownImpl* orig_impl) {
|
|
Method original_mousedown =
|
|
class_getInstanceMethod([frame_view class], @selector(mouseDown:));
|
|
*orig_impl = (MouseDownImpl)method_getImplementation(original_mousedown);
|
|
Method new_mousedown =
|
|
class_getInstanceMethod([SwizzledMethodsClass class], swiz_selector);
|
|
method_setImplementation(original_mousedown,
|
|
method_getImplementation(new_mousedown));
|
|
}
|
|
#else
|
|
// components/remote_cocoa/app_shim/bridged_content_view.h overrides
|
|
// swipeWithEvent, so we can't just override the implementation
|
|
// in ElectronNSWindow like we do with for ex. rotateWithEvent.
|
|
void SwizzleSwipeWithEvent(NSView* view, SEL swiz_selector) {
|
|
Method original_swipe_with_event =
|
|
class_getInstanceMethod([view class], @selector(swipeWithEvent:));
|
|
Method new_swipe_with_event =
|
|
class_getInstanceMethod([SwizzledMethodsClass class], swiz_selector);
|
|
method_setImplementation(original_swipe_with_event,
|
|
method_getImplementation(new_swipe_with_event));
|
|
}
|
|
#endif
|
|
|
|
} // namespace
|
|
|
|
@implementation ElectronNSWindow
|
|
|
|
@synthesize acceptsFirstMouse;
|
|
@synthesize enableLargerThanScreen;
|
|
@synthesize disableAutoHideCursor;
|
|
@synthesize disableKeyOrMainWindow;
|
|
@synthesize vibrantView;
|
|
|
|
- (id)initWithShell:(electron::NativeWindowMac*)shell
|
|
styleMask:(NSUInteger)styleMask {
|
|
if ((self = [super initWithContentRect:ui::kWindowSizeDeterminedLater
|
|
styleMask:styleMask
|
|
backing:NSBackingStoreBuffered
|
|
defer:NO])) {
|
|
#if IS_MAS_BUILD()
|
|
// The first time we create a frameless window, we swizzle the
|
|
// implementation of -[NSNextStepFrame mouseDown:], replacing it with our
|
|
// own.
|
|
// This is only necessary on MAS where we can't directly refer to
|
|
// NSNextStepFrame or NSThemeFrame, as they are private APIs.
|
|
// See components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm for
|
|
// the non-MAS-compatible way of doing this.
|
|
if (styleMask & NSWindowStyleMaskTitled) {
|
|
if (!g_nsthemeframe_mousedown) {
|
|
NSView* theme_frame = [[self contentView] superview];
|
|
DCHECK_EQ("NSThemeFrame"sv, class_getName([theme_frame class]));
|
|
SwizzleMouseDown(theme_frame, @selector(swiz_nsthemeframe_mouseDown:),
|
|
&g_nsthemeframe_mousedown);
|
|
}
|
|
} else {
|
|
if (!g_nsnextstepframe_mousedown) {
|
|
NSView* nextstep_frame = [[self contentView] superview];
|
|
DCHECK_EQ("NSNextStepFrame"sv, class_getName([nextstep_frame class]));
|
|
SwizzleMouseDown(nextstep_frame,
|
|
@selector(swiz_nsnextstepframe_mouseDown:),
|
|
&g_nsnextstepframe_mousedown);
|
|
}
|
|
}
|
|
#else
|
|
NSView* view = [[self contentView] superview];
|
|
SwizzleSwipeWithEvent(view, @selector(swiz_nsview_swipeWithEvent:));
|
|
#endif // IS_MAS_BUILD
|
|
shell_ = shell;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)cleanup {
|
|
shell_ = nullptr;
|
|
}
|
|
|
|
- (electron::NativeWindowMac*)shell {
|
|
return shell_;
|
|
}
|
|
|
|
- (id)accessibilityFocusedUIElement {
|
|
if (!shell_ || !shell_->widget() || shell_->IsFocused())
|
|
return [super accessibilityFocusedUIElement];
|
|
return nil;
|
|
}
|
|
- (NSRect)originalContentRectForFrameRect:(NSRect)frameRect {
|
|
return [super contentRectForFrameRect:frameRect];
|
|
}
|
|
|
|
- (NSTouchBar*)makeTouchBar {
|
|
if (shell_ && shell_->touch_bar())
|
|
return [shell_->touch_bar() makeTouchBar];
|
|
else
|
|
return nil;
|
|
}
|
|
|
|
// NSWindow overrides.
|
|
|
|
- (void)sendEvent:(NSEvent*)event {
|
|
// Draggable regions only respond to left-click dragging, but the system will
|
|
// still suppress right-clicks in a draggable region. Temporarily disabling
|
|
// draggable regions allows the underlying views to respond to right-click
|
|
// to potentially bring up a frame context menu.
|
|
BOOL shouldDisableDraggable =
|
|
(event.type == NSEventTypeRightMouseDown ||
|
|
(event.type == NSEventTypeLeftMouseDown &&
|
|
([event modifierFlags] & NSEventModifierFlagControl)));
|
|
|
|
if (shouldDisableDraggable) {
|
|
electron::api::WebContents::SetDisableDraggableRegions(true);
|
|
}
|
|
|
|
[super sendEvent:event];
|
|
|
|
if (shouldDisableDraggable) {
|
|
electron::api::WebContents::SetDisableDraggableRegions(false);
|
|
}
|
|
}
|
|
|
|
- (void)rotateWithEvent:(NSEvent*)event {
|
|
if (shell_)
|
|
shell_->NotifyWindowRotateGesture(event.rotation);
|
|
}
|
|
|
|
- (NSRect)contentRectForFrameRect:(NSRect)frameRect {
|
|
if (shell_ && shell_->has_frame())
|
|
return [super contentRectForFrameRect:frameRect];
|
|
else
|
|
return frameRect;
|
|
}
|
|
|
|
- (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen*)screen {
|
|
// Resizing is disabled.
|
|
if (electron::ScopedDisableResize::IsResizeDisabled())
|
|
return [self frame];
|
|
|
|
NSRect result = [super constrainFrameRect:frameRect toScreen:screen];
|
|
// Enable the window to be larger than screen.
|
|
if ([self enableLargerThanScreen]) {
|
|
// If we have a frame, ensure that we only position the window
|
|
// somewhere where the user can move or resize it (and not
|
|
// behind the menu bar, for instance)
|
|
//
|
|
// If there's no frame, put the window wherever the developer
|
|
// wanted it to go
|
|
if (shell_ && shell_->has_frame()) {
|
|
result.size = frameRect.size;
|
|
} else {
|
|
result = frameRect;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
- (void)setFrame:(NSRect)windowFrame display:(BOOL)displayViews {
|
|
// constrainFrameRect is not called on hidden windows so disable adjusting
|
|
// the frame directly when resize is disabled
|
|
if (!electron::ScopedDisableResize::IsResizeDisabled())
|
|
[super setFrame:windowFrame display:displayViews];
|
|
}
|
|
|
|
- (void)orderWindow:(NSWindowOrderingMode)place relativeTo:(NSInteger)otherWin {
|
|
[self disableHeadlessMode];
|
|
[super orderWindow:place relativeTo:otherWin];
|
|
}
|
|
|
|
- (id)accessibilityAttributeValue:(NSString*)attribute {
|
|
if ([attribute isEqual:NSAccessibilityEnabledAttribute])
|
|
return [NSNumber numberWithBool:YES];
|
|
if (![attribute isEqualToString:@"AXChildren"])
|
|
return [super accessibilityAttributeValue:attribute];
|
|
|
|
// We want to remove the window title (also known as
|
|
// NSAccessibilityReparentingCellProxy), which VoiceOver already sees.
|
|
// * when VoiceOver is disabled, this causes Cmd+C to be used for TTS but
|
|
// still leaves the buttons available in the accessibility tree.
|
|
// * when VoiceOver is enabled, the full accessibility tree is used.
|
|
// Without removing the title and with VO disabled, the TTS would always read
|
|
// the window title instead of using Cmd+C to get the selected text.
|
|
NSPredicate* predicate =
|
|
[NSPredicate predicateWithFormat:@"(self.className != %@)",
|
|
@"NSAccessibilityReparentingCellProxy"];
|
|
|
|
NSArray* children = [super accessibilityAttributeValue:attribute];
|
|
NSMutableArray* mutableChildren = [children mutableCopy];
|
|
[mutableChildren filterUsingPredicate:predicate];
|
|
|
|
return mutableChildren;
|
|
}
|
|
|
|
- (NSString*)accessibilityTitle {
|
|
return base::SysUTF8ToNSString(shell_ ? shell_->GetTitle() : "");
|
|
}
|
|
|
|
- (NSString*)accessibilityDocument {
|
|
// Prefer representedFilename set via Electron's setRepresentedFilename API.
|
|
// This works around a Chromium change (https://crrev.com/c/6187085) where
|
|
// NativeWidgetMacNSWindow's accessibilityDocument override doesn't fall back
|
|
// to NSWindow's default behavior of returning the representedFilename.
|
|
NSString* representedFilename = [self representedFilename];
|
|
if (representedFilename.length > 0) {
|
|
return [[NSURL fileURLWithPath:representedFilename] absoluteString];
|
|
}
|
|
// Fall back to Chromium's implementation for web content URLs.
|
|
return [super accessibilityDocument];
|
|
}
|
|
|
|
- (BOOL)canBecomeMainWindow {
|
|
return !self.disableKeyOrMainWindow;
|
|
}
|
|
|
|
- (BOOL)canBecomeKeyWindow {
|
|
return !self.disableKeyOrMainWindow;
|
|
}
|
|
|
|
- (NSView*)frameView {
|
|
return [[self contentView] superview];
|
|
}
|
|
|
|
- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
|
|
// By default "Close Window" is always disabled when window has no title, to
|
|
// support closing a window without title we need to manually do menu item
|
|
// validation. This code path is used by the "roundedCorners" option.
|
|
if ([item action] == @selector(performClose:))
|
|
return shell_ && shell_->IsClosable();
|
|
return [super validateUserInterfaceItem:item];
|
|
}
|
|
|
|
- (void)disableHeadlessMode {
|
|
if (shell_ && self.isHeadless) {
|
|
// We initialize the window in headless mode to allow painting before it is
|
|
// shown, but we don't want the headless behavior of allowing the window to
|
|
// be placed unconstrained.
|
|
self.isHeadless = false;
|
|
if (shell_->widget())
|
|
shell_->widget()->DisableHeadlessMode();
|
|
}
|
|
}
|
|
|
|
// Quicklook methods
|
|
|
|
- (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
return YES;
|
|
}
|
|
|
|
- (void)beginPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
panel.dataSource = static_cast<id<QLPreviewPanelDataSource>>([self delegate]);
|
|
}
|
|
|
|
- (void)endPreviewPanelControl:(QLPreviewPanel*)panel {
|
|
panel.dataSource = nil;
|
|
}
|
|
|
|
// Custom window button methods
|
|
|
|
- (BOOL)windowShouldClose:(id)sender {
|
|
return YES;
|
|
}
|
|
|
|
- (void)performClose:(id)sender {
|
|
if (shell_->title_bar_style() ==
|
|
electron::NativeWindowMac::TitleBarStyle::kCustomButtonsOnHover) {
|
|
[[self delegate] windowShouldClose:self];
|
|
} else if (!([self styleMask] & NSWindowStyleMaskTitled)) {
|
|
// performClose does not work for windows without title, so we have to
|
|
// emulate its behavior. This code path is used by "simpleFullscreen" and
|
|
// "roundedCorners" options.
|
|
if ([[self delegate] respondsToSelector:@selector(windowShouldClose:)]) {
|
|
if (![[self delegate] windowShouldClose:self])
|
|
return;
|
|
} else if ([self respondsToSelector:@selector(windowShouldClose:)]) {
|
|
if (![self windowShouldClose:self])
|
|
return;
|
|
}
|
|
[self close];
|
|
} else if (shell_->is_modal() && shell_->parent() && shell_->IsVisible()) {
|
|
// We don't want to actually call [window close] here since
|
|
// we've already called endSheet on the modal sheet.
|
|
return;
|
|
} else {
|
|
[super performClose:sender];
|
|
}
|
|
}
|
|
|
|
- (BOOL)toggleFullScreenMode:(id)sender {
|
|
if (!shell_)
|
|
return NO;
|
|
|
|
bool is_simple_fs = shell_->IsSimpleFullScreen();
|
|
bool always_simple_fs = shell_->always_simple_fullscreen();
|
|
|
|
// If we're in simple fullscreen mode and trying to exit it
|
|
// we need to ensure we exit it properly to prevent a crash
|
|
// with NSWindowStyleMaskTitled mode.
|
|
if (is_simple_fs || always_simple_fs) {
|
|
shell_->SetSimpleFullScreen(!is_simple_fs);
|
|
} else {
|
|
if (shell_->IsVisible()) {
|
|
// Until 10.13, AppKit would obey a call to -toggleFullScreen: made inside
|
|
// windowDidEnterFullScreen & windowDidExitFullScreen. Starting in 10.13,
|
|
// it behaves as though the transition is still in progress and just emits
|
|
// "not in a fullscreen state" when trying to exit fullscreen in the same
|
|
// runloop that entered it. To handle this, invoke -toggleFullScreen:
|
|
// asynchronously.
|
|
[super performSelector:@selector(toggleFullScreen:)
|
|
withObject:nil
|
|
afterDelay:0];
|
|
} else {
|
|
[super toggleFullScreen:sender];
|
|
}
|
|
|
|
// Exiting fullscreen causes Cocoa to redraw the NSWindow, which resets
|
|
// the enabled state for NSWindowZoomButton. We need to persist it.
|
|
bool maximizable = shell_->IsMaximizable();
|
|
shell_->SetMaximizable(maximizable);
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (void)performMiniaturize:(id)sender {
|
|
if (shell_ &&
|
|
shell_->title_bar_style() ==
|
|
electron::NativeWindowMac::TitleBarStyle::kCustomButtonsOnHover) {
|
|
[self miniaturize:self];
|
|
} else {
|
|
[super performMiniaturize:sender];
|
|
}
|
|
}
|
|
|
|
@end
|