2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
|
Date: Thu, 20 Sep 2018 17:46:28 -0700
|
|
|
|
|
Subject: render_widget_host_view_mac.patch
|
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
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.
|
2018-09-21 00:30:26 +00:00
|
|
|
|
2019-05-13 18:49:01 +00:00
|
|
|
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
|
2020-01-17 18:41:52 +00:00
|
|
|
index 4df726e8331572fe96551fdde60b4174aff30588..66b1e2b52c9da2d485fd9f076e1628861a74cb69 100644
|
2019-05-13 18:49:01 +00:00
|
|
|
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
|
|
|
|
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -154,6 +154,11 @@ void ExtractUnderlines(NSAttributedString* string,
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
|
|
+@interface NSWindow (AtomCustomMethods)
|
|
|
|
|
+- (BOOL)acceptsFirstMouse;
|
|
|
|
|
+- (BOOL)disableAutoHideCursor;
|
|
|
|
|
+@end
|
|
|
|
|
+
|
|
|
|
|
// These are not documented, so use only after checking -respondsToSelector:.
|
|
|
|
|
@interface NSApplication (UndocumentedSpeechMethods)
|
|
|
|
|
- (void)speakString:(NSString*)string;
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -573,6 +578,9 @@ - (BOOL)acceptsMouseEventsWhenInactive {
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
|
|
|
|
|
+ if ([self.window respondsToSelector:@selector(acceptsFirstMouse)] &&
|
|
|
|
|
+ [self.window acceptsFirstMouse])
|
|
|
|
|
+ return YES;
|
|
|
|
|
return [self acceptsMouseEventsWhenInactive];
|
|
|
|
|
}
|
|
|
|
|
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -983,6 +991,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv {
|
2018-09-14 05:02:16 +00:00
|
|
|
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) {
|
2019-12-13 20:13:12 +00:00
|
|
|
_hostHelper->ForwardKeyboardEvent(event, latency_info);
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -1762,9 +1774,11 @@ - (NSAccessibilityRole)accessibilityRole {
|
2018-09-14 05:02:16 +00:00
|
|
|
// 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.
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -1773,7 +1787,10 @@ - (NSArray*)validAttributesForMarkedText {
|
2018-09-14 05:02:16 +00:00
|
|
|
initWithObjects:NSUnderlineStyleAttributeName,
|
|
|
|
|
NSUnderlineColorAttributeName,
|
|
|
|
|
NSMarkedClauseSegmentAttributeName,
|
|
|
|
|
- NSTextInputReplacementRangeAttributeName, nil]);
|
|
|
|
|
+#ifndef MAS_BUILD
|
|
|
|
|
+ NSTextInputReplacementRangeAttributeName,
|
|
|
|
|
+#endif
|
|
|
|
|
+ nil]);
|
|
|
|
|
}
|
2019-12-13 20:13:12 +00:00
|
|
|
return _validAttributesForMarkedText.get();
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
