From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Cheng Zhao 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 0825f3f1ef87120a9b82d3f52289dc54d2d6f233..5f6e5b078672c0336cee72300a7a37d6284db226 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 @@ -160,6 +160,15 @@ void ExtractUnderlines(NSAttributedString* string, } // namespace +@interface NSWindow (AtomCustomMethods) +- (BOOL)acceptsFirstMouse; +- (BOOL)disableAutoHideCursor; +@end + +@interface NSView (ElectronCustomMethods) +- (BOOL)shouldIgnoreMouseEvent; +@end + // RenderWidgetHostViewCocoa --------------------------------------------------- // Private methods: @@ -742,6 +751,9 @@ - (BOOL)acceptsMouseEventsWhenInactive { } - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent { + if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] && + [self.window acceptsFirstMouse]) + return YES; return [self acceptsMouseEventsWhenInactive]; } @@ -826,6 +838,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] && @@ -1154,6 +1170,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);