@@ -162,6 +162,7 @@ - (NSString *)keyStringFromEvent:(NSEvent *)event {
162
162
case 24 : return @" =" ;
163
163
case 50 : return @" `" ;
164
164
case 42 : return @" \\ " ;
165
+
165
166
default : return @" " ;
166
167
}
167
168
}
@@ -283,14 +284,13 @@ - (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenP
283
284
return proposedOptions | NSApplicationPresentationAutoHideToolbar;
284
285
}
285
286
}
286
- - (void )windowDidChangeVisibility : (NSNotification *)notification {
287
+ - (void )windowDidChangeOcclusionState : (NSNotification *)notification {
287
288
NSWindow *window = notification.object ;
288
- BOOL isVisible = ! [window isVisible ] ;
289
+ BOOL isVisible = ( [window occlusionState ] & NSWindowOcclusionStateVisible) != 0 ;
289
290
if (hasListeners (isVisible ? EventWindowShow : EventWindowHide)) {
290
291
processWindowEvent (self.windowId , isVisible ? EventWindowShow : EventWindowHide);
291
292
}
292
293
}
293
- // GENERATED EVENTS START
294
294
- (void )windowDidBecomeKey : (NSNotification *)notification {
295
295
if ( hasListeners (EventWindowDidBecomeKey) ) {
296
296
processWindowEvent (self.windowId , EventWindowDidBecomeKey);
@@ -339,12 +339,6 @@ - (void)windowDidChangeEffectiveAppearance:(NSNotification *)notification {
339
339
}
340
340
}
341
341
342
- - (void )windowDidChangeOcclusionState : (NSNotification *)notification {
343
- if ( hasListeners (EventWindowDidChangeOcclusionState) ) {
344
- processWindowEvent (self.windowId , EventWindowDidChangeOcclusionState);
345
- }
346
- }
347
-
348
342
- (void )windowDidChangeOrderingMode : (NSNotification *)notification {
349
343
if ( hasListeners (EventWindowDidChangeOrderingMode) ) {
350
344
processWindowEvent (self.windowId , EventWindowDidChangeOrderingMode);
@@ -747,25 +741,25 @@ - (void)windowHide:(NSNotification *)notification {
747
741
}
748
742
}
749
743
750
- - (void )webView : (WKWebView *)webview didStartProvisionalNavigation : (WKNavigation *)navigation {
744
+ - (void )webView : (nonnull WKWebView *)webview didStartProvisionalNavigation : (WKNavigation *)navigation {
751
745
if ( hasListeners (EventWebViewDidStartProvisionalNavigation) ) {
752
746
processWindowEvent (self.windowId , EventWebViewDidStartProvisionalNavigation);
753
747
}
754
748
}
755
749
756
- - (void )webView : (WKWebView *)webview didReceiveServerRedirectForProvisionalNavigation : (WKNavigation *)navigation {
750
+ - (void )webView : (nonnull WKWebView *)webview didReceiveServerRedirectForProvisionalNavigation : (WKNavigation *)navigation {
757
751
if ( hasListeners (EventWebViewDidReceiveServerRedirectForProvisionalNavigation) ) {
758
752
processWindowEvent (self.windowId , EventWebViewDidReceiveServerRedirectForProvisionalNavigation);
759
753
}
760
754
}
761
755
762
- - (void )webView : (WKWebView *)webview didFinishNavigation : (WKNavigation *)navigation {
756
+ - (void )webView : (nonnull WKWebView *)webview didFinishNavigation : (WKNavigation *)navigation {
763
757
if ( hasListeners (EventWebViewDidFinishNavigation) ) {
764
758
processWindowEvent (self.windowId , EventWebViewDidFinishNavigation);
765
759
}
766
760
}
767
761
768
- - (void )webView : (WKWebView *)webview didCommitNavigation : (WKNavigation *)navigation {
762
+ - (void )webView : (nonnull WKWebView *)webview didCommitNavigation : (WKNavigation *)navigation {
769
763
if ( hasListeners (EventWebViewDidCommitNavigation) ) {
770
764
processWindowEvent (self.windowId , EventWebViewDidCommitNavigation);
771
765
}
0 commit comments