joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

app/internal/window: [iOS] move logic out of GioAppDelegate

Browse Source 
We'd like to remove GioAppDelegate when Gio is embedded with
gogio's -buildmode=archive. Minimize the code in GioAppDelegate.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-26 15:14:56 +02:00
parent 913a780d64
commit 79014a81d5
3 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/os_ios.go
+5
View File
@@ -309,3 +309,8 @@ func NewWindow(win Callbacks, opts *Options) error {
func Main() {
}
//export gio_runMain
func gio_runMain() {
runMain()
}
app/internal/window/os_ios.m
+36 -27
View File
@@ -13,45 +13,32 @@
@interface GioViewController : UIViewController
@property(weak) UIScreen *screen;
+ (UIWindow *)createWindow;
@end
@implementation GioAppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
gio_runMain();
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
GioViewController *controller = [[GioViewController alloc] initWithNibName:nil bundle:nil];
controller.screen = self.window.screen;
self.window.rootViewController = controller;
[self.window makeKeyAndVisible];
self.window = [GioViewController createWindow];
[self.window makeKeyAndVisible];
return YES;
}
- (void)applicationWillResignActive:(UIApplication *)application {
}
- (void)applicationDidEnterBackground:(UIApplication *)application {
GioViewController *vc = (GioViewController *)self.window.rootViewController;
UIView *drawView = vc.view.subviews[0];
if (drawView != nil) {
onStop((__bridge CFTypeRef)drawView);
}
}
- (void)applicationWillEnterForeground:(UIApplication *)application {
GioViewController *c = (GioViewController*)self.window.rootViewController;
UIView *drawView = c.view.subviews[0];
if (drawView != nil) {
CFTypeRef viewRef = (__bridge CFTypeRef)drawView;
gio_onDraw(viewRef);
}
}
@end
@implementation GioViewController
CGFloat _keyboardHeight;
+ (UIWindow *)createWindow {
UIWindow *window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
GioViewController *controller = [[self alloc] initWithNibName:nil bundle:nil];
controller.screen = window.screen;
window.rootViewController = controller;
return window;
}
- (void)loadView {
gio_runMain();
CGRect zeroFrame = CGRectMake(0, 0, 0, 0);
self.view = [[UIView alloc] initWithFrame:zeroFrame];
self.view.layoutMargins = UIEdgeInsetsMake(0, 0, 0, 0);
@@ -76,6 +63,28 @@ CGFloat _keyboardHeight;
selector:@selector(keyboardWillHide:)
name:UIKeyboardWillHideNotification
object:nil];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationDidEnterBackground:)
name: UIApplicationDidEnterBackgroundNotification
object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(applicationWillEnterForeground:)
name: UIApplicationWillEnterForegroundNotification
object: nil];
}
- (void)applicationWillEnterForeground:(UIApplication *)application {
UIView *drawView = self.view.subviews[0];
if (drawView != nil) {
gio_onDraw((__bridge CFTypeRef)drawView);
}
}
- (void)applicationDidEnterBackground:(UIApplication *)application {
UIView *drawView = self.view.subviews[0];
if (drawView != nil) {
onStop((__bridge CFTypeRef)drawView);
}
}
- (void)viewDidDisappear:(BOOL)animated {
app/internal/window/runmain_ios.go
-12
View File
@@ -1,12 +0,0 @@
// SPDX-License-Identifier: Unlicense OR MIT
// +build darwin,ios
package window
import "C"
//export gio_runMain
func gio_runMain() {
runMain()
}