08b7a1f801
* chore: bump chromium in DEPS to 137.0.7139.0 * chore: bump chromium in DEPS to 137.0.7141.0 * chore: update patches Refs6474596Refs6443472Refs6471184* [ServiceWorker] Pipe is_for_service_worker into OverrideURLLoaderFactoryParams Refs6459481* Reland "[PermissionOptions] Use PermissionDescriptorPtr in PermissionControllerDelegate" Refs6455975* clickiness: Check attestation and user settings on origins Refs6356796* extensions : Move ReloadExtension from ExtensionService Refs6472812Refs6472777* fixup! Update AppleKeychain API to be friendlier Refs6443472* chore: script/gen-libc++-filenames.js * Rename ColorVariant::CovertToSkColor() to ColorVariant::ResolveToSkColor() Refs6373793* [headless] Provide headless aware window metrics on Windows Refs6374074--------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
61 lines
2.5 KiB
Diff
61 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:46:28 -0700
|
|
Subject: render_widget_host_view_mac.patch
|
|
|
|
This allows Electron to override `acceptsFirstMouse` on Mac so that windows can
|
|
respond to the first mouse click in their window, which is desirable for some
|
|
kinds of utility windows. Similarly for `disableAutoHideCursor`.
|
|
|
|
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
index a6b6917ee2c02c091aa51b55449d93fa55e06ac2..eca43bf620111c27c400ae2d95880e47c34fbc59 100644
|
|
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
@@ -170,6 +170,15 @@ void ExtractUnderlines(NSAttributedString* string,
|
|
|
|
} // namespace
|
|
|
|
+@interface NSWindow (AtomCustomMethods)
|
|
+- (BOOL)acceptsFirstMouse;
|
|
+- (BOOL)disableAutoHideCursor;
|
|
+@end
|
|
+
|
|
+@interface NSView (ElectronCustomMethods)
|
|
+- (BOOL)shouldIgnoreMouseEvent;
|
|
+@end
|
|
+
|
|
// RenderWidgetHostViewCocoa ---------------------------------------------------
|
|
|
|
// Private methods:
|
|
@@ -774,6 +783,9 @@ - (AcceptMouseEventsOption)acceptsMouseEventsOption {
|
|
}
|
|
|
|
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
|
+ if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] &&
|
|
+ [self.window acceptsFirstMouse])
|
|
+ return YES;
|
|
// Enable "click-through" if mouse clicks are accepted in inactive windows
|
|
return [self acceptsMouseEventsOption] > kAcceptMouseEventsInActiveWindow;
|
|
}
|
|
@@ -919,6 +931,10 @@ - (BOOL)shouldIgnoreMouseEvent:(NSEvent*)theEvent {
|
|
// its parent view.
|
|
BOOL hitSelf = NO;
|
|
while (view) {
|
|
+ if ([view respondsToSelector:@selector(shouldIgnoreMouseEvent)] && ![view shouldIgnoreMouseEvent]) {
|
|
+ return NO;
|
|
+ }
|
|
+
|
|
if (view == self)
|
|
hitSelf = YES;
|
|
if ([view isKindOfClass:[self class]] && ![view isEqual:self] &&
|
|
@@ -1253,6 +1269,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
|
|
eventType == NSEventTypeKeyDown &&
|
|
!(modifierFlags & NSEventModifierFlagCommand);
|
|
|
|
+ if ([theEvent.window respondsToSelector:@selector(disableAutoHideCursor)] &&
|
|
+ [theEvent.window disableAutoHideCursor])
|
|
+ shouldAutohideCursor = NO;
|
|
+
|
|
// We only handle key down events and just simply forward other events.
|
|
if (eventType != NSEventTypeKeyDown) {
|
|
_hostHelper->ForwardKeyboardEvent(event, latencyInfo);
|