123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Cheng Zhao <[email protected]>
- 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`.
- Additionally, disables usage of some private APIs in MAS builds.
- 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 1393c9c8382dd405edd9a5515210176395a98fe5..38bd45e0ca66af9f78bb532e411db66dc8d9d5da 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
- @@ -154,6 +154,15 @@ void ExtractUnderlines(NSAttributedString* string,
-
- } // namespace
-
- +@interface NSWindow (AtomCustomMethods)
- +- (BOOL)acceptsFirstMouse;
- +- (BOOL)disableAutoHideCursor;
- +@end
- +
- +@interface NSView (ElectronCustomMethods)
- +- (BOOL)shouldIgnoreMouseEvent;
- +@end
- +
- // These are not documented, so use only after checking -respondsToSelector:.
- @interface NSApplication (UndocumentedSpeechMethods)
- - (void)speakString:(NSString*)string;
- @@ -610,6 +619,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
- }
-
- - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
- + if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] &&
- + [self.window acceptsFirstMouse])
- + return YES;
- return [self acceptsMouseEventsWhenInactive];
- }
-
- @@ -686,6 +698,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] &&
- @@ -1005,6 +1021,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
- eventType == NSKeyDown &&
- !(modifierFlags & NSCommandKeyMask);
-
- + 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 != NSKeyDown) {
- _hostHelper->ForwardKeyboardEvent(event, latency_info);
- @@ -1751,9 +1771,11 @@ - (NSAccessibilityRole)accessibilityRole {
- // Since this implementation doesn't have to wait any IPC calls, this doesn't
- // make any key-typing jank. --hbono 7/23/09
- //
- +#ifndef MAS_BUILD
- extern "C" {
- extern NSString* NSTextInputReplacementRangeAttributeName;
- }
- +#endif
-
- - (NSArray*)validAttributesForMarkedText {
- // This code is just copied from WebKit except renaming variables.
- @@ -1762,7 +1784,10 @@ - (NSArray*)validAttributesForMarkedText {
- initWithObjects:NSUnderlineStyleAttributeName,
- NSUnderlineColorAttributeName,
- NSMarkedClauseSegmentAttributeName,
- - NSTextInputReplacementRangeAttributeName, nil]);
- +#ifndef MAS_BUILD
- + NSTextInputReplacementRangeAttributeName,
- +#endif
- + nil]);
- }
- return _validAttributesForMarkedText.get();
- }
|