50b9c7051e
* chore: bump chromium in DEPS to 675d7dc9f3334b15c3ec28c27db3dc19b26bd12e * chore: update patches * chore: bump chromium in DEPS to dce3562696f165a324273fcb6893f0e1fef42ab1 * chore: const interfaces are being removed from //content Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1631749 Bug: https://bugs.chromium.org/p/chromium/issues/detail?id=908139 * chore: update patches * chore: blink::MediaStreamType is now consistent and deduplicated * chore: update patches and printing code for ref -> uniq * chore: bridge_impl() --> GetInProcessNSWindowBridge Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1642988 * fixme: TotalMarkedObjectSize has been removed * chore: fix linting * chore: bump chromium in DEPS to 9503e1a2fcbf17db08094d8caae3e1407e918af3 * chore: fix slightly broken printing patch * chore: update patches for SiteInstanceImpl changes Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1612025 * chore: update patches for SiteInstanceImpl changes * chore: bump chromium in DEPS to 6801e6c1ddd1b7b73e594e97157ddd539ca335d7 * chore: update patches * chore: bump chromium in DEPS to 27e198912d7c1767052ec785c22e2e88b2cb4d8b * chore: remove system_request_context Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1647172 * chore: creation of FtpProtocolHandler needs an auth cache Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1639683 * fixme: disable marked spec * chore: bump chromium in DEPS to 3dcd7fe453ad13a22b114b95f05590eba74c5471 * chore: bump chromium in DEPS to bdc24128b75008743d819e298557a53205706e7c * chore: bump chromium in DEPS to 7da330b58fbe0ba94b9b94abbb8085bead220228 * update patches * remove TotalMarkedObjectSize https://chromium-review.googlesource.com/c/chromium/src/+/1631708 * add libvulkan.so to dist zip manifest on linux * chore: bump chromium in DEPS to 1e85d0f45b52649efd0010cc9dab6d2804f24443 * update patches * add angle features to gpuinfo https://chromium-review.googlesource.com/c/chromium/src/+/1638658 * mark 'marked' property as deprecated * disable webview resize test * FIXME: disable vulkan on 32-bit arm * chore: bump chromium in DEPS to cd0297c6a83fdd2b1f6bc312e7d5acca736a3c56 * Revert "FIXME: disable vulkan on 32-bit arm" This reverts commit 5c1e0ef302a6db1e72231d4e823f91bb08e281af. * backport from upstream: fix swiftshader build on arm https://swiftshader-review.googlesource.com/c/SwiftShader/+/32768/ * update patches * viz: update OutputDeviceWin to new shared memory api https://chromium-review.googlesource.com/c/chromium/src/+/1649574 * base::Contains{Key,Value} => base::Contains https://chromium-review.googlesource.com/c/chromium/src/+/1649478 * fixup! viz: update OutputDeviceWin to new shared memory api * stub out StatusIconLinuxDbus-related delegate methods https://chromium-review.googlesource.com/c/chromium/src/+/1638180 * chore: bump chromium in DEPS to 964ea3fd4bdc006d62533f5755043076220181f1 * Remove the BrowserContext methods to create URLRequestContexts for main/media partitions when a partition_domain is specified https://chromium-review.googlesource.com/c/chromium/src/+/1655087 * fixup! stub out StatusIconLinuxDbus-related delegate methods * add remote_cocoa to chromium_src deps https://chromium-review.googlesource.com/c/chromium/src/+/1657068 * fixup! stub out StatusIconLinuxDbus-related delegate methods * attempt at fix linux-debug build * add swiftshader/libvulkan.so to arm manifest * chore: bump chromium in DEPS to 28688f76afef27c36631aa274691e333ddecdc22 * update patches * chore: bump chromium in DEPS to fe7450e1578a9584189f87d59d0d1a8548bf6b90 * chore: bump chromium in DEPS to f304dfd682dc86a755a6c49a16ee6876e0db45fb * chore: bump chromium in DEPS to f0fd4d6c365aad9edd83bdfff9954c47d271b75c * Update patches * Remove no longer needed WOA patch * Put back IOThread in BrowserProcess We need this until we enable the network service. * move atom.ico to inputs * Update to latest LKGR to fix no template named 'bitset' in namespace 'std' * fixup! Put back IOThread in BrowserProcess * chore: bump chromium in DEPS to dcf9662dc9a896a175d791001350324167b1cad3 * Update patches content_allow_embedder_to_prevent_locking_scheme_registry.patch is no longer necessary as it was upstreamed via https://chromium-review.googlesource.com/c/chromium/src/+/1637040 * Fix renamed enum * Use newer docker container Contains updated dependencies * Try to track down arm test failures * Fix arm tests * chore: bump chromium in DEPS to 8cbceef57b37ee14b9c4c3405a3f7663922c5b5d * Update patches * Add needed dependencies for testing 32-bit linux * Remove arm debugging. * Remove additional debugging * Fix compiler errors * Handle new macOS helper * Fix compile error on Linux * chore: bump chromium in DEPS to 66a93991ddaff6a9f1b13d110959947cb03a1860 * Add new helper files to manifests * fix BUILD.gn for macOS * Fix compile errors * Add patch to put back colors needed for autofill/datalist * chore: bump chromium in DEPS to e89617079f11e33f33cdb3924f719a579c73704b * Updated patches * Remove no longer needed patch * Remove no longer needed patch * Fix compile error with patch * Really fix the patch * chore: bump chromium in DEPS to c70f12476a45840408f1d5ff5968e7f7ceaad9d4 * chore: bump chromium in DEPS to 06d2dd7a8933b41545a7c26349c802f570563fd5 * chore: bump chromium in DEPS to b0b9ff8f727deb519ccbec7cf1c8d9ed543d88ab * Update patches * Fix compiler errors * Fix removed ChromeNetLog * Revert "Fix removed ChromeNetLog" This reverts commit 426dfd90b5ab0a9c1df415d71c88e8aed2bd5bbe. * Remove ChromeNetLog. https://chromium-review.googlesource.com/c/chromium/src/+/1663846 * chore: bump chromium in DEPS to fefcc4926d58dccd59ac95be65eab3a4ebfe2f29 * Update patches * Update v8 patches * Fix lint error * Fix compile errors * chore: bump chromium in DEPS to 4de815ef92ef2eef515506fe09bdc466526a8fd9 * Use custom protocol to test baseURLForDataURL * Use newer SDK (10.0.18362) for Windows * Update patches * Update arm manifest since swiftshader reenabled. * Don't delete dir that isn't ever there. * Fix compile errors. * Need src dir created * Update for removed InspectorFrontendAPI.addExtensions * Revert "Use newer SDK (10.0.18362) for Windows" This reverts commit 68763a0c88cdc44b971462e49662aecc167d3d99. * Revert "Need src dir created" This reverts commit 7daedc29d0844316d4097648dde7f40f1a3848fb. * Revert "Don't delete dir that isn't ever there." This reverts commit bf424bc30ffcb23b1d9a634d4df410342536640e. * chore: bump chromium in DEPS to 97dab6b0124ea53244caf123921b5d14893bcca7 * chore: bump chromium in DEPS to c87d16d49a85dc7122781f6c979d354c20f7f78b * chore: bump chromium in DEPS to 004bcee2ea336687cedfda8f8a151806ac757d15 * chore: bump chromium in DEPS to 24428b26a9d15a013b2a253e1084ec3cb54b660b * chore: bump chromium in DEPS to fd25914e875237df88035a6abf89a70bf1360b57 * Update patches * Update node to fix build error * Fix compile errors * chore: bump chromium in DEPS to 3062b7cf090f1d9522c04ca8fa0a906f88ababe9 * chore: update node ref for pushed tags * chore: update patches for new chromium * chore: fix printing patches * Use new (10.0.18362) Windows SDK * roll node to fix v8 build issues in debug build * Add support for plugin helper * fix: add patch to fix gpu info enumeration Can be removed once CL lands upstream. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1685993 * spec: navigator.requestMIDIAccess now requires a secure origin This test requires a secure origin so we fake one. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1657952 * FIXME: temporarily disable SharedWorker tests * use released version of node-abstractsocket * fix abstract-socket
306 lines
10 KiB
Text
306 lines
10 KiB
Text
// 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/atom_ns_window_delegate.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "base/mac/mac_util.h"
|
|
#include "components/remote_cocoa/app_shim/native_widget_ns_window_bridge.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/native_window_mac.h"
|
|
#include "shell/browser/ui/cocoa/atom_preview_item.h"
|
|
#include "shell/browser/ui/cocoa/atom_touch_bar.h"
|
|
#include "ui/views/cocoa/native_widget_mac_ns_window_host.h"
|
|
#include "ui/views/widget/native_widget_mac.h"
|
|
|
|
using TitleBarStyle = electron::NativeWindowMac::TitleBarStyle;
|
|
|
|
@implementation AtomNSWindowDelegate
|
|
|
|
- (id)initWithShell:(electron::NativeWindowMac*)shell {
|
|
// The views library assumes the window delegate must be an instance of
|
|
// ViewsNSWindowDelegate, since we don't have a way to override the creation
|
|
// of NSWindowDelegate, we have to dynamically replace the window delegate
|
|
// on the fly.
|
|
// TODO(zcbenz): Add interface in NativeWidgetMac to allow overriding creating
|
|
// window delegate.
|
|
auto* bridge_host = views::NativeWidgetMacNSWindowHost::GetFromNativeWindow(
|
|
shell->GetNativeWindow());
|
|
auto* bridged_view = bridge_host->GetInProcessNSWindowBridge();
|
|
if ((self = [super initWithBridgedNativeWidget:bridged_view])) {
|
|
shell_ = shell;
|
|
is_zooming_ = false;
|
|
level_ = [shell_->GetNativeWindow().GetNativeNSWindow() level];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
#pragma mark - NSWindowDelegate
|
|
|
|
- (void)windowDidChangeOcclusionState:(NSNotification*)notification {
|
|
// notification.object is the window that changed its state.
|
|
// It's safe to use self.window instead if you don't assign one delegate to
|
|
// many windows
|
|
NSWindow* window = notification.object;
|
|
|
|
// check occlusion binary flag
|
|
if (window.occlusionState & NSWindowOcclusionStateVisible) {
|
|
// The app is visible
|
|
shell_->NotifyWindowShow();
|
|
} else {
|
|
// The app is not visible
|
|
shell_->NotifyWindowHide();
|
|
}
|
|
}
|
|
|
|
// Called when the user clicks the zoom button or selects it from the Window
|
|
// menu to determine the "standard size" of the window.
|
|
- (NSRect)windowWillUseStandardFrame:(NSWindow*)window
|
|
defaultFrame:(NSRect)frame {
|
|
if (!shell_->zoom_to_page_width())
|
|
return frame;
|
|
|
|
// If the shift key is down, maximize.
|
|
if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask)
|
|
return frame;
|
|
|
|
// Get preferred width from observers. Usually the page width.
|
|
int preferred_width = 0;
|
|
shell_->NotifyWindowRequestPreferredWith(&preferred_width);
|
|
|
|
// Never shrink from the current size on zoom.
|
|
NSRect window_frame = [window frame];
|
|
CGFloat zoomed_width =
|
|
std::max(static_cast<CGFloat>(preferred_width), NSWidth(window_frame));
|
|
|
|
// |frame| determines our maximum extents. We need to set the origin of the
|
|
// frame -- and only move it left if necessary.
|
|
if (window_frame.origin.x + zoomed_width > NSMaxX(frame))
|
|
frame.origin.x = NSMaxX(frame) - zoomed_width;
|
|
else
|
|
frame.origin.x = window_frame.origin.x;
|
|
|
|
// Set the width. Don't touch y or height.
|
|
frame.size.width = zoomed_width;
|
|
|
|
return frame;
|
|
}
|
|
|
|
- (void)windowDidBecomeKey:(NSNotification*)notification {
|
|
shell_->NotifyWindowFocus();
|
|
}
|
|
|
|
- (void)windowDidResignKey:(NSNotification*)notification {
|
|
shell_->NotifyWindowBlur();
|
|
}
|
|
|
|
- (NSSize)windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize {
|
|
NSSize newSize = frameSize;
|
|
double aspectRatio = shell_->GetAspectRatio();
|
|
|
|
if (aspectRatio > 0.0) {
|
|
gfx::Size windowSize = shell_->GetSize();
|
|
gfx::Size contentSize = shell_->GetContentSize();
|
|
gfx::Size extraSize = shell_->GetAspectRatioExtraSize();
|
|
|
|
double extraWidthPlusFrame =
|
|
windowSize.width() - contentSize.width() + extraSize.width();
|
|
double extraHeightPlusFrame =
|
|
windowSize.height() - contentSize.height() + extraSize.height();
|
|
|
|
newSize.width =
|
|
roundf((frameSize.height - extraHeightPlusFrame) * aspectRatio +
|
|
extraWidthPlusFrame);
|
|
newSize.height =
|
|
roundf((newSize.width - extraWidthPlusFrame) / aspectRatio +
|
|
extraHeightPlusFrame);
|
|
}
|
|
|
|
{
|
|
bool prevent_default = false;
|
|
gfx::Rect new_bounds(gfx::Point(sender.frame.origin), gfx::Size(newSize));
|
|
shell_->NotifyWindowWillResize(new_bounds, &prevent_default);
|
|
if (prevent_default) {
|
|
return sender.frame.size;
|
|
}
|
|
}
|
|
|
|
return newSize;
|
|
}
|
|
|
|
- (void)windowDidResize:(NSNotification*)notification {
|
|
[super windowDidResize:notification];
|
|
shell_->NotifyWindowResize();
|
|
}
|
|
|
|
- (void)windowDidMove:(NSNotification*)notification {
|
|
[super windowDidMove:notification];
|
|
// TODO(zcbenz): Remove the alias after figuring out a proper
|
|
// way to dispatch move.
|
|
shell_->NotifyWindowMove();
|
|
shell_->NotifyWindowMoved();
|
|
}
|
|
|
|
- (void)windowWillMiniaturize:(NSNotification*)notification {
|
|
NSWindow* window = shell_->GetNativeWindow().GetNativeNSWindow();
|
|
// store the current status window level to be restored in
|
|
// windowDidDeminiaturize
|
|
level_ = [window level];
|
|
[window setLevel:NSNormalWindowLevel];
|
|
}
|
|
|
|
- (void)windowDidMiniaturize:(NSNotification*)notification {
|
|
[super windowDidMiniaturize:notification];
|
|
shell_->NotifyWindowMinimize();
|
|
}
|
|
|
|
- (void)windowDidDeminiaturize:(NSNotification*)notification {
|
|
[super windowDidDeminiaturize:notification];
|
|
[shell_->GetNativeWindow().GetNativeNSWindow() setLevel:level_];
|
|
shell_->NotifyWindowRestore();
|
|
}
|
|
|
|
- (BOOL)windowShouldZoom:(NSWindow*)window toFrame:(NSRect)newFrame {
|
|
is_zooming_ = true;
|
|
return YES;
|
|
}
|
|
|
|
- (void)windowDidEndLiveResize:(NSNotification*)notification {
|
|
if (is_zooming_) {
|
|
if (shell_->IsMaximized())
|
|
shell_->NotifyWindowMaximize();
|
|
else
|
|
shell_->NotifyWindowUnmaximize();
|
|
is_zooming_ = false;
|
|
}
|
|
}
|
|
|
|
- (void)windowWillEnterFullScreen:(NSNotification*)notification {
|
|
// Setting resizable to true before entering fullscreen
|
|
is_resizable_ = shell_->IsResizable();
|
|
shell_->SetResizable(true);
|
|
// Hide the native toolbar before entering fullscreen, so there is no visual
|
|
// artifacts.
|
|
if (shell_->title_bar_style() == TitleBarStyle::HIDDEN_INSET) {
|
|
NSWindow* window = shell_->GetNativeWindow().GetNativeNSWindow();
|
|
[window setToolbar:nil];
|
|
}
|
|
}
|
|
|
|
- (void)windowDidEnterFullScreen:(NSNotification*)notification {
|
|
shell_->NotifyWindowEnterFullScreen();
|
|
|
|
// For frameless window we don't show set title for normal mode since the
|
|
// titlebar is expected to be empty, but after entering fullscreen mode we
|
|
// have to set one, because title bar is visible here.
|
|
NSWindow* window = shell_->GetNativeWindow().GetNativeNSWindow();
|
|
if ((shell_->transparent() || !shell_->has_frame()) &&
|
|
// FIXME(zcbenz): Showing titlebar for hiddenInset window is weird under
|
|
// fullscreen mode.
|
|
// Show title if fullscreen_window_title flag is set
|
|
(shell_->title_bar_style() != TitleBarStyle::HIDDEN_INSET ||
|
|
shell_->fullscreen_window_title())) {
|
|
[window setTitleVisibility:NSWindowTitleVisible];
|
|
}
|
|
|
|
// Restore the native toolbar immediately after entering fullscreen, if we
|
|
// do this before leaving fullscreen, traffic light buttons will be jumping.
|
|
if (shell_->title_bar_style() == TitleBarStyle::HIDDEN_INSET) {
|
|
base::scoped_nsobject<NSToolbar> toolbar(
|
|
[[NSToolbar alloc] initWithIdentifier:@"titlebarStylingToolbar"]);
|
|
[toolbar setShowsBaselineSeparator:NO];
|
|
[window setToolbar:toolbar];
|
|
|
|
// Set window style to hide the toolbar, otherwise the toolbar will show
|
|
// in fullscreen mode.
|
|
[window setTitlebarAppearsTransparent:NO];
|
|
shell_->SetStyleMask(true, NSWindowStyleMaskFullSizeContentView);
|
|
}
|
|
}
|
|
|
|
- (void)windowWillExitFullScreen:(NSNotification*)notification {
|
|
// Restore the titlebar visibility.
|
|
NSWindow* window = shell_->GetNativeWindow().GetNativeNSWindow();
|
|
if ((shell_->transparent() || !shell_->has_frame()) &&
|
|
(shell_->title_bar_style() != TitleBarStyle::HIDDEN_INSET ||
|
|
shell_->fullscreen_window_title())) {
|
|
[window setTitleVisibility:NSWindowTitleHidden];
|
|
}
|
|
|
|
// Turn off the style for toolbar.
|
|
if (shell_->title_bar_style() == TitleBarStyle::HIDDEN_INSET) {
|
|
shell_->SetStyleMask(false, NSWindowStyleMaskFullSizeContentView);
|
|
[window setTitlebarAppearsTransparent:YES];
|
|
}
|
|
}
|
|
|
|
- (void)windowDidExitFullScreen:(NSNotification*)notification {
|
|
shell_->SetResizable(is_resizable_);
|
|
shell_->NotifyWindowLeaveFullScreen();
|
|
}
|
|
|
|
- (void)windowWillClose:(NSNotification*)notification {
|
|
shell_->NotifyWindowClosed();
|
|
|
|
// Clears the delegate when window is going to be closed, since EL Capitan it
|
|
// is possible that the methods of delegate would get called after the window
|
|
// has been closed.
|
|
auto* bridge_host = views::NativeWidgetMacNSWindowHost::GetFromNativeWindow(
|
|
shell_->GetNativeWindow());
|
|
auto* bridged_view = bridge_host->GetInProcessNSWindowBridge();
|
|
bridged_view->OnWindowWillClose();
|
|
}
|
|
|
|
- (BOOL)windowShouldClose:(id)window {
|
|
shell_->NotifyWindowCloseButtonClicked();
|
|
return NO;
|
|
}
|
|
|
|
- (NSRect)window:(NSWindow*)window
|
|
willPositionSheet:(NSWindow*)sheet
|
|
usingRect:(NSRect)rect {
|
|
NSView* view = window.contentView;
|
|
|
|
rect.origin.x = shell_->GetSheetOffsetX();
|
|
rect.origin.y = view.frame.size.height - shell_->GetSheetOffsetY();
|
|
return rect;
|
|
}
|
|
|
|
- (void)windowWillBeginSheet:(NSNotification*)notification {
|
|
shell_->NotifyWindowSheetBegin();
|
|
}
|
|
|
|
- (void)windowDidEndSheet:(NSNotification*)notification {
|
|
shell_->NotifyWindowSheetEnd();
|
|
}
|
|
|
|
- (IBAction)newWindowForTab:(id)sender {
|
|
shell_->NotifyNewWindowForTab();
|
|
electron::Browser::Get()->NewWindowForTab();
|
|
}
|
|
|
|
#pragma mark - NSTouchBarDelegate
|
|
|
|
- (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
|
|
makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
|
|
API_AVAILABLE(macosx(10.12.2)) {
|
|
if (touchBar && shell_->touch_bar())
|
|
return [shell_->touch_bar() makeItemForIdentifier:identifier];
|
|
else
|
|
return nil;
|
|
}
|
|
|
|
#pragma mark - QLPreviewPanelDataSource
|
|
|
|
- (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel*)panel {
|
|
return 1;
|
|
}
|
|
|
|
- (id<QLPreviewItem>)previewPanel:(QLPreviewPanel*)panel
|
|
previewItemAtIndex:(NSInteger)index {
|
|
return shell_->preview_item();
|
|
}
|
|
|
|
@end
|