MacOSX: Make wxWebviewWebkit capture hotkeys less eagerly.

徐扬斌 · coremail-cyt · commit 4647c3cefe10 · 2024-07-03T18:47:42.000+08:00
On MacOSX, the wxWebviewWebkit will eagerly capture the hotkeys despite the fact that it might be the one in focus. This will interfere other widgets' functions. It should only handle the hotkeys when it is the firstResponder. More about firstResponder: https://developer.apple.com/documentation/appkit/nswindow/1419440-firstresponder
diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
@@ -618,6 +618,10 @@ -(id)validRequestorForSendType:(NSString*)sendType returnType:(NSString*)returnT
 
 - (BOOL)performKeyEquivalent:(NSEvent *)event
 {
+    if (self.window.firstResponder != self) 
+    {
+        return NO;
+    }
     if ([event modifierFlags] & NSCommandKeyMask)
     {
         switch ([event.characters characterAtIndex:0])

Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,10 @@ -(id)validRequestorForSendType:(NSString)sendType returnType:(NSString)returnT`
`618`	`618`
`619`	`619`	`- (BOOL)performKeyEquivalent:(NSEvent *)event`
`620`	`620`	`{`
	`621`	`+ if (self.window.firstResponder != self)`
	`622`	`+ {`
	`623`	`+ return NO;`
	`624`	`+ }`
`621`	`625`	`if ([event modifierFlags] & NSCommandKeyMask)`
`622`	`626`	`{`
`623`	`627`	`switch ([event.characters characterAtIndex:0])`