Drew WeymouthandClaude Sonnet 4.6
d43e0c126b
GLFW's applicationShouldTerminate: converts all quit paths (Cmd+Q, dock, menu bar) into window close requests and returns NSTerminateCancel, so our close-to-hide intercept was hiding the window instead of letting the app exit. Fix by implementing applicationShouldTerminate: in ReopenDelegate, setting a darwinQuitting flag before forwarding to GLFW's delegate. The close intercept checks this flag and calls Window.Close() instead of Hide() when quitting. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
53 lines
1.4 KiB
Objective-C
53 lines
1.4 KiB
Objective-C
//go:build darwin
|
|
|
|
#import <AppKit/AppKit.h>
|
|
|
|
extern void appReopened(void);
|
|
extern void appShouldTerminate(void);
|
|
|
|
@interface ReopenDelegate : NSObject<NSApplicationDelegate>
|
|
@property (nonatomic, strong) id<NSApplicationDelegate> wrapped;
|
|
@end
|
|
|
|
|
|
@implementation ReopenDelegate
|
|
|
|
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
|
|
// Set the quitting flag before GLFW's delegate fires close requests for
|
|
// each window, so our close intercept knows to close rather than hide.
|
|
appShouldTerminate();
|
|
if ([self.wrapped respondsToSelector:_cmd]) {
|
|
return [self.wrapped applicationShouldTerminate:sender];
|
|
}
|
|
return NSTerminateNow;
|
|
}
|
|
|
|
- (BOOL)applicationShouldHandleReopen:(NSApplication *)app
|
|
hasVisibleWindows:(BOOL)hasVisible {
|
|
if (!hasVisible) {
|
|
appReopened();
|
|
}
|
|
if ([self.wrapped respondsToSelector:_cmd]) {
|
|
return [self.wrapped applicationShouldHandleReopen:app
|
|
hasVisibleWindows:hasVisible];
|
|
}
|
|
return YES;
|
|
}
|
|
|
|
- (BOOL)respondsToSelector:(SEL)sel {
|
|
return [super respondsToSelector:sel] ||
|
|
[self.wrapped respondsToSelector:sel];
|
|
}
|
|
|
|
- (id)forwardingTargetForSelector:(SEL)sel {
|
|
return [self.wrapped respondsToSelector:sel] ? self.wrapped : nil;
|
|
}
|
|
|
|
@end
|
|
|
|
void installReopenDelegate(void) {
|
|
ReopenDelegate *d = [ReopenDelegate new];
|
|
d.wrapped = [NSApp delegate];
|
|
[NSApp setDelegate:d];
|
|
}
|