Merge pull request #83 from UnityTech/xwzhu

ios safearea + keyboardshow event

.DS_Store

-
Bud1 
d.batIl

 
@
�





 
@
�






 
@
�






 
@ 	build.batIlocblob;(������build.bat.metaIlocblob�(������build.shIlocblob
(������
build.sh.metaIlocblob
�(������CHANGELOG.mdIlocblob
�(������CHANGELOG.md.metaIlocblob;�������CONTRIBUTING.mdIlocblob��������CONTRIBUTING.md.metaIlocblob
�������Documentation~Ilocblob
��������EditorIlocblob
��������Editor.metaIlocblob;
������
+
Bud1
GELOG.

 
@
�





 
@
�






 
@
�






 
@CHANGELOG.mdIlocblob
�(������CHANGELOG.md.metaIlocblob;�������CONTRIBUTING.mdIlocblob��������CONTRIBUTING.md.metaIlocblob
�������Documentation~Ilocblob
��������EditorIlocblob
��������Editor.metaIlocblob;
������
-Tests.metaIlocblob�X������Third Party Notices.mdIlocblob
X������Third Party Notices.md.metaIlocblob
�X������!UIWidgetCleanupPlugin.DotSettingsIlocblob
�X������&UIWidgetCleanupPlugin.DotSettings.metaIlocblob;�������E
DSDB
 `
�





 
@
�






 
@
�






 
@lesIlocblob�
�������Samples.metaIlocblob

�������scriptsIlocblob
�
�������scripts.metaIlocblob
�
�������TestsIlocblob;X������
-Tests.metaIlocblob�X������Third Party Notices.mdIlocblob
X������Third Party Notices.md.metaIlocblob
�X������!UIWidgetCleanupPlugin.DotSettingsIlocblob
�X������&UIWidgetCleanupPlugin.DotSettings.metaIlocblob;�������
+Tests.metaIlocblob�X������Third Party Notices.mdIlocblob
X������Third Party Notices.md.metaIlocblob
�X������!UIWidgetCleanupPlugin.DotSettingsIlocblob
�X������&UIWidgetCleanupPlugin.DotSettings.metaIlocblob;�������E
DSDB
 `
�





 
@
�






 
@
�






 
@;X������
+Tests.metaIlocblob�X������Third Party Notices.mdIlocblob
X������Third Party Notices.md.metaIlocblob
�X������!UIWidgetCleanupPlugin.DotSettingsIlocblob
�X������&UIWidgetCleanupPlugin.DotSettings.metaIlocblob;�������

Runtime/editor/editor_utils.cs

 using System.Collections;
 using System.Reflection;
 using Unity.UIWidgets.engine;
+using Unity.UIWidgets.ui;
 using UnityEngine;
 
 
         public float devicePixelRatio {
             get { return this._lastDevicePixelRatio; }
         }
+
+        public viewMetrics viewMetrics {
+            get {
+                return new viewMetrics {
+                    insets_bottom = 0,
+                    insets_left = 0,
+                    insets_right = 0,
+                    insets_top = 0,
+                    padding_left = 0,
+                    padding_top = 0,
+                    padding_right = 0,
+                    padding_bottom = 0
+                };
+            }
+        }
+
+        public WindowPadding viewPadding {
+            get { return WindowPadding.zero; }
+        }
+        
+        public WindowPadding viewInsets {
+            get { return WindowPadding.zero; }
+        }
+        
+        
     }
 
     static class GameViewUtil {

Runtime/editor/editor_window.cs

         float _lastWindowWidth;
         float _lastWindowHeight;
 
+        bool _viewMetricsChanged;
+
         readonly MicrotaskQueue _microtaskQueue = new MicrotaskQueue();
         readonly TimerProvider _timerProvider = new TimerProvider();
         readonly Rasterizer _rasterizer = new Rasterizer();
         }
 
         protected virtual void updateSafeArea() {
+        }
+
+        public void onViewMetricsChanged() {
+            this._viewMetricsChanged = true;
         }
 
         protected abstract bool hasFocus();
                 return true;
             }
 
+            if (this._viewMetricsChanged) {
+                return true;
+            }
+
             return false;
         }
 
                         this._lastWindowHeight * this._devicePixelRatio);
 
                     this.updateSafeArea();
+                    this._viewMetricsChanged = false;
                     if (this.onMetricsChanged != null) {
                         this.onMetricsChanged();
                     }

Runtime/engine/DisplayMetrics.cs

 using System;
 using System.Runtime.InteropServices;
+using Unity.UIWidgets.ui;
+    [StructLayout(LayoutKind.Sequential)]
+    public struct viewMetrics {
+        public float insets_top;
+        public float insets_bottom;
+        public float insets_left;
+        public float insets_right;
+
+        public float padding_top;
+        public float padding_bottom;
+        public float padding_left;
+        public float padding_right;
+    }
+
     public static class DisplayMetricsProvider {
         public static Func<DisplayMetrics> provider = () => new PlayerDisplayMetrics();
     }
         void Update();
 
         float devicePixelRatio { get; } 
+        
+        viewMetrics viewMetrics { get; }
+
+        WindowPadding viewPadding { get; }
+        
+        WindowPadding viewInsets { get; }
+        viewMetrics? _viewMetrics = null;
 
         public void OnEnable() {
         }
         }
 
         public void Update() {
+            //view metrics marks dirty
+            this._viewMetrics = null;
         }
 
 
             
         }
 
+        public WindowPadding viewPadding {
+            get { 
+                return new WindowPadding(this.viewMetrics.padding_left,
+                this.viewMetrics.padding_top,
+                this.viewMetrics.padding_right,
+                this.viewMetrics.padding_bottom);
+            }
+        }
+        
+        public WindowPadding viewInsets { 
+            get { 
+            return new WindowPadding(this.viewMetrics.insets_left,
+                this.viewMetrics.insets_top,
+                this.viewMetrics.insets_right,
+                this.viewMetrics.insets_bottom);
+            } 
+        }
+
+        public viewMetrics viewMetrics {
+            get {
+                if (this._viewMetrics != null) {
+                    return this._viewMetrics.Value;
+                }
+                
+#if UNITY_ANDROID
+                this._viewMetrics = new viewMetrics {
+                    insets_bottom = 0,
+                    insets_left = 0,
+                    insets_right = 0,
+                    insets_top = 0,
+                    padding_left = Screen.safeArea.x,
+                    padding_top = Screen.safeArea.y,
+                    padding_right = Screen.width - Screen.safeArea.width - Screen.safeArea.x,
+                    padding_bottom = Screen.height - Screen.safeArea.height - Screen.safeArea.y
+                };
+#elif UNITY_WEBGL
+                this._viewMetrics = new viewMetrics {
+                    insets_bottom = 0,
+                    insets_left = 0,
+                    insets_right = 0,
+                    insets_top = 0,
+                    padding_left = 0,
+                    padding_top = 0,
+                    padding_right = 0,
+                    padding_bottom = 0
+                };
+#elif UNITY_IOS
+                viewMetrics metrics = IOSGetViewportPadding();
+                this._viewMetrics = metrics;
+#else
+                this._viewMetrics = new viewMetrics {
+                    insets_bottom = 0,
+                    insets_left = 0,
+                    insets_right = 0,
+                    insets_top = 0,
+                    padding_left = 0,
+                    padding_top = 0,
+                    padding_right = 0,
+                    padding_bottom = 0
+                };
+#endif
+                return this._viewMetrics.Value;
+            }
+        }
+
 #if UNITY_ANDROID 
         static float AndroidDevicePixelRatio() {
             using (
 #if UNITY_IOS
         [DllImport("__Internal")]
         static extern int IOSDeviceScaleFactor();
+
+		[DllImport("__Internal")]
+		static extern viewMetrics IOSGetViewportPadding();
-        
+
     }
 }

Runtime/engine/UIWidgetsPanel.cs

 using System.Collections.Generic;
 using Unity.UIWidgets.async;
 using Unity.UIWidgets.editor;
+using Unity.UIWidgets.external.simplejson;
 using Unity.UIWidgets.foundation;
 using Unity.UIWidgets.ui;
 using Unity.UIWidgets.widgets;
         readonly UIWidgetsPanel _uiWidgetsPanel;
         bool _needsPaint;
 
+
-            this._padding = new WindowPadding(
-                Screen.safeArea.x,
-                Screen.safeArea.y,
-                Screen.width - Screen.safeArea.width - Screen.safeArea.x,
-                Screen.height - Screen.safeArea.height - Screen.safeArea.y);
+            this._padding = this._uiWidgetsPanel.viewPadding;
+            this._viewInsets = this._uiWidgetsPanel.viewInsets;
         }
 
         protected override bool hasFocus() {
         Vector2 _lastMouseMove;
 
         HashSet<int> _enteredPointers;
+        
+        bool _viewMetricsCallbackRegistered;
 
         bool _mouseEntered {
             get { return !this._enteredPointers.isEmpty(); }
         DisplayMetrics _displayMetrics;
 
         const int mouseButtonNum = 3;
+
+        void _handleViewMetricsChanged(string method, List<JSONNode> args) {
+            this._windowAdapter.onViewMetricsChanged();
+            this._displayMetrics.Update();
+        }
 
         protected override void OnEnable() {
             base.OnEnable();
             this._displayMetrics = DisplayMetricsProvider.provider();
             this._displayMetrics.OnEnable();
-
+            
             if (_repaintEvent == null) {
                 _repaintEvent = new Event {type = EventType.Repaint};
             }
             }
         }
 
+        public WindowPadding viewPadding {
+            get { return this._displayMetrics.viewPadding; }
+        }
+
+        public WindowPadding viewInsets {
+            get { return this._displayMetrics.viewInsets; }
+        }
+
         protected virtual Widget createWidget() {
             return null;
         }
         protected virtual void Update() {
             this._displayMetrics.Update();
             UIWidgetsMessageManager.ensureUIWidgetsMessageManagerIfNeeded();
+
+            if (!this._viewMetricsCallbackRegistered) {
+                this._viewMetricsCallbackRegistered = true;
+                UIWidgetsMessageManager.instance?.AddChannelMessageDelegate("ViewportMatricsChanged",
+                    this._handleViewMetricsChanged);
+            }
 
             if (this._mouseEntered) {
                 if (this._lastMouseMove.x != Input.mousePosition.x || this._lastMouseMove.y != Input.mousePosition.y) {

Runtime/Plugins/platform/ios/UIWidgetsViewController.h

+#ifndef PLATFORM_IOS_FRAMEWORK_SOURCE_UIWIDGETSVIEWCONTROLLER_H_
+#define PLATFORM_IOS_FRAMEWORK_SOURCE_UIWIDGETSVIEWCONTROLLER_H_
+
+#import <UIKit/UIKit.h>
+#include "UIWidgetsTextInputDelegate.h"
+
+
+struct viewPadding
+{
+    float top;
+    float bottom;
+    float left;
+    float right;
+};
+
+struct viewMetrics
+{
+    float insets_top;
+    float insets_bottom;
+    float insets_left;
+    float insets_right;
+    
+    float padding_top;
+    float padding_bottom;
+    float padding_left;
+    float padding_right;
+};
+
+@interface UIWidgetsViewController : NSObject
+@property viewPadding padding;
+@property viewPadding viewInsets;
+@end
+
+#endif  // PLATFORM_IOS_FRAMEWORK_SOURCE_UIWIDGETSVIEWCONTROLLER_H_

Runtime/Plugins/platform/ios/UIWidgetsViewController.h.meta

+fileFormatVersion: 2
+guid: a797fb0a2ddb84d4e8ac7f6da5d70819
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Plugins/platform/ios/UIWidgetsViewController.mm

+#include "UIWidgetsViewController.h"
+#include "UIWidgetsMessageManager.h"
+#include <Foundation/Foundation.h>
+#include <UIKit/UIKit.h>
+
+@implementation UIWidgetsViewController {
+}
+
+@synthesize viewInsets;
+@synthesize padding;
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        viewInsets.bottom = 0;
+        viewInsets.top = 0;
+        viewInsets.left = 0;
+        viewInsets.right = 0;
+
+        CGFloat scale = [[UIScreen mainScreen] scale];
+        if (@available(iOS 11, *)) {
+            padding.bottom = [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom * scale;
+            padding.top = [UIApplication sharedApplication].keyWindow.safeAreaInsets.top * scale;
+            padding.left = [UIApplication sharedApplication].keyWindow.safeAreaInsets.left * scale;
+            padding.right = [UIApplication sharedApplication].keyWindow.safeAreaInsets.right * scale;
+        } else {
+            CGRect statusFrame = [UIApplication sharedApplication].statusBarFrame;
+            padding.bottom = 0;
+            padding.top = statusFrame.size.height * scale;
+            padding.left = 0;
+            padding.right = 0;
+        }
+
+        NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
+        [center addObserver:self
+                   selector:@selector(keyboardWillChangeFrame:)
+                       name:UIKeyboardWillChangeFrameNotification
+                     object:nil];
+        [center addObserver:self
+                   selector:@selector(keyboardWillBeHidden:)
+                       name:UIKeyboardWillHideNotification
+                     object:nil];
+    }
+
+    return self;
+}
+
+-(void)keyboardWillBeHidden:(NSNotification*)notification {
+    viewInsets.bottom = 0;
+    CGFloat scale = [UIScreen mainScreen].scale;
+    if (@available(iOS 11, *)) {
+        CGFloat cur_padding = [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom * scale;
+        padding.bottom = cur_padding;
+    } else {
+        CGRect statusFrame = [UIApplication sharedApplication].statusBarFrame;
+        CGFloat cur_padding = statusFrame.size.height * scale;
+        padding.top = cur_padding;
+    }
+
+    UIWidgetsMethodMessage(@"ViewportMatricsChanged", @"UIWidgetViewController.keyboardHide", @[]);
+}
+
+-(void)keyboardWillChangeFrame:(NSNotification*)notification {
+    NSDictionary* info = [notification userInfo];
+    CGFloat bottom = CGRectGetHeight([[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]);
+    CGFloat scale = [UIScreen mainScreen].scale;
+
+    viewInsets.bottom = bottom * scale;
+    padding.bottom = 0;
+
+    UIWidgetsMethodMessage(@"ViewportMatricsChanged", @"UIWidgetViewController.keyboardHide", @[]);
+}
+
+-(void)tryLaunch {
+
+}
+
++ (instancetype)sharedInstance {
+    static UIWidgetsViewController *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[UIWidgetsViewController alloc] init];
+    });
+    return sharedInstance;
+}
+
+@end
+
+extern "C"
+{
+    viewMetrics IOSGetViewportPadding()
+    {
+        viewMetrics metrics;
+        viewPadding insets = [[UIWidgetsViewController sharedInstance] viewInsets];
+        viewPadding padding = [[UIWidgetsViewController sharedInstance] padding];
+        metrics.insets_bottom = insets.bottom;
+        metrics.insets_top = insets.top;
+        metrics.insets_left = insets.left;
+        metrics.insets_right = insets.right;
+        metrics.padding_bottom = padding.bottom;
+        metrics.padding_top = padding.top;
+        metrics.padding_left = padding.left;
+        metrics.padding_right = padding.right;
+
+        return metrics;
+    }
+}

Runtime/Plugins/platform/ios/UIWidgetsViewController.mm.meta

+fileFormatVersion: 2
+guid: fc3d8a9d616f147929ae9b8898fa01bf
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

scripts/node_modules.meta

-fileFormatVersion: 2
-guid: 7d78b565ea82c414a9c59aa6ccd9bd2c
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: