joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 09:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/app: (iOS) move UIWindow notifications to GioView

Browse Source 
Simplifies GioAppDelegate and allows for proper deregistering of
listener.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-20 09:04:00 +02:00
parent 3099e7474f
commit 4b3b8fa413
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/os_ios.m
+17 -10
View File
@@ -40,16 +40,6 @@ static void redraw(CFTypeRef viewRef, BOOL sync) {
GioViewController *controller = [[GioViewController alloc] initWithNibName:nil bundle:nil]; GioViewController *controller = [[GioViewController alloc] initWithNibName:nil bundle:nil];
controller.screen = self.window.screen; controller.screen = self.window.screen;
self.window.rootViewController = controller; self.window.rootViewController = controller;
[[NSNotificationCenter defaultCenter] addObserverForName:UIWindowDidBecomeKeyNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
UIView *view = self.window.rootViewController.view;
if (view != nil)
onFocus((__bridge CFTypeRef)view, YES);
}];
[[NSNotificationCenter defaultCenter] addObserverForName:UIWindowDidResignKeyNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
UIView *view = self.window.rootViewController.view;
if (view != nil)
onFocus((__bridge CFTypeRef)view, NO);
}];
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
return YES; return YES;
} }
@@ -146,6 +136,23 @@ NSArray<UIKeyCommand *> *_keyCommands;
return self; return self;
} }
- (void)willMoveToWindow:(UIWindow *)newWindow {
if (self.window != nil) {
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIWindowDidBecomeKeyNotification object:self.window];
[[NSNotificationCenter defaultCenter] removeObserver:self name:UIWindowDidResignKeyNotification object:self.window];
}
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onWindowDidBecomeKey:) name:UIWindowDidBecomeKeyNotification object:newWindow];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onWindowDidResignKey:) name:UIWindowDidResignKeyNotification object:newWindow];
}
- (void)onWindowDidBecomeKey:(NSNotification *)note {
onFocus((__bridge CFTypeRef)self, YES);
}
- (void)onWindowDidResignKey:(NSNotification *)note {
onFocus((__bridge CFTypeRef)self, NO);
}
- (void)dealloc { - (void)dealloc {
[displayLink invalidate]; [displayLink invalidate];
} }