Merge branch 'master' of github.com:UnityTech/UIWidgets into mouse_tracking

# Conflicts:
#	Samples/UIWidgetsGallery/gallery/app.cs

Author: zhuxingwei

README-ZH.md

@@ -179,15 +179,18 @@ UIWidgets也支持Gif！
 当一个Unity项目运行在Android设备上时，状态栏是默认隐藏且无法在编辑内进行调整的。
 如果您希望在您的UIWidgets App中显示状态栏，您可以使用这个[解决方案](https://github.com/Over17/UnityShowAndroidStatusBar)。我们将尽快推出我们自己的解决方案，并保证届时开发者可以进行无缝切换。
 
+此外，为了让上述插件在Android P及以上Android系统中正常工作，请勾选上"Player Settings"中的"Render Outside Safe Area"选项。
+
 #### 七、自动调节帧率
 如果要使得构建出的应用能够自动调节帧率，请打开Project Settings，将构建目标平台对应的Quality选项卡中的V Sync Count设置为Don't Sync。
 默认的逻辑是在界面静止时将帧率降低为25，在界面变动时将帧率提高至60。
 如果您需要修改帧率升高或降低时的行为，请将`Window.onFrameRateSpeedUp`和/或`Window.onFrameRateCoolDown`设置为您自己的函数。
 
 #### 八、WebGL Canvas分辨率调整插件
 因为浏览器中Canvas的宽高和其在显示器上的像素数可能不一致，所以构建出的WebGL程序中画面可能会模糊。
-插件`Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio.jslib`解决了这个问题。
-如果您因为任何原因需要禁止此插件，请在Project面板中选中该插件，在Inspector面板中的Define Constraints参数中，输入任意（没有被Unity定义为宏）的字符串（例如`ENABLE_CANVAS_DEVICE_PIXEL_RATIO_PLUGIN`），使得只有在Player Settings中定义了这个宏，此插件才会启用。
+插件`Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio_20xx.x.jslib`（目前有2018.3和2019.1）解决了这个问题。
+请根据您的项目的Unity版本选择对应的插件，并禁用此插件的其他版本。方法如下：在Project面板中选中该插件，在Inspector面板中的Select platforms for plugin中，去掉WebGL后面的对勾。
+如果您因为任何原因需要完全禁止此插件的功能，请按上述方法禁用此插件的所有版本。
 
 此插件覆盖了Unity WebGL构建模块中的如下参数：
 ```

README.md

@@ -208,7 +208,13 @@ Status bar is always hidden by default when an Unity project is running on an An
  want to show the status bar in your App, this
  [solution](https://github.com/Over17/UnityShowAndroidStatusBar) seems to be 
  compatible to UIWidgets, therefore can be used as a good option before we release our
- full support solution on this issue.
+ full support solution on this issue. 
+ 
+ Besides,
+ please set "Render Outside Safe Area" to true in the "Player Settings" to make this plugin working properly on Android P or later.
+ 
+ 
+
 
 #### Automatically Adjust Frame Rate
 
@@ -219,8 +225,9 @@ If you would like to modify the behavior of speeding up or cooling down the fram
 #### WebGL Canvas Device Pixel Ratio Plugin
 The width and height of the Canvas in browser may differ from the number of pixels the Canvas occupies on the screen.
 Therefore, the image may blur in the builded WebGL program.
-The Plugin `Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio.jslib` solves this issue.
-If you need to disable this plugin for any reason, please select this plugin in the **Project** panel, and put an arbitrary string (that is not defined as a macro by Unity) in the **Define Constraints** field in the **Inspector** panel (for example, `ENABLE_CANVAS_DEVICE_PIXEL_RATIO_PLUGIN`), so that the plugin is enabled only if this macro is defined in **Player Settings**, which effectively disables the plugin.
+The Plugin `Plugins/platform/webgl/UIWidgetsCanvasDevicePixelRatio_20xx.x.jslib` (2018.3 and 2019.1 for now) solves this issue.
+Please select the plugin of the Unity version corresponding to your project, and disable other versions of this plugin, as follows: select this plugin in the **Project** panel, and uncheck **WebGL** under **Select platforms for plugin** in the **Inspector** panel.
+If you need to disable this plugin for any reason, please disable all the versions of this plugin as described above.
 
 This plugin overrides the following parameters in the Unity WebGL building module:
 ```

Runtime/utils.meta renamed to Runtime/InternalBridge.meta

@@ -0,0 +1,12 @@
+{
+    "name": "Unity.InternalAPIEngineBridge.024",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}

Runtime/InternalBridge/InternalBridge.asmdef

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+
+namespace Unity.UIWidgets.InternalBridge {
+    public static class NoAllocHelpersBridge<T> {
+        public static T[] ExtractArrayFromListT(List<T> list) {
+            return UnityEngine.NoAllocHelpers.ExtractArrayFromListT(list);
+        }
+
+        public static void ResizeList(List<T> list, int size) {
+            if (size < list.Count) {
+                list.RemoveRange(size, list.Count - size);
+                return;
+            }
+
+            if (size == list.Count) {
+                return;
+            }
+
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            UnityEngine.NoAllocHelpers.ResizeList(list, size);
+        }
+
+        public static void EnsureListElemCount(List<T> list, int size) {
+            list.Clear();
+            if (list.Capacity < size) {
+                list.Capacity = size;
+            }
+
+            ResizeList(list, size);
+        }
+    }
+}

Runtime/InternalBridge/InternalBridge.asmdef.meta

@@ -35,7 +35,7 @@ public static UIWidgetsViewController getInstance() {
     private boolean keyboardOpen;
 
     private void setup() {
-        Log.i("tag", "On Setup");
+        //Log.i("tag", "On Setup 2");
 
         keyboardOpen = false;
         viewMetrics = new UIWidgetsViewMetrics();
@@ -111,7 +111,7 @@ private boolean hasNavigationBar() {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        
+        //Log.i("UIWidgetsDebug", " hasBar: " + hasBar);
         return hasBar;
     }
 
@@ -120,6 +120,8 @@ public void updateViewMetrics() {
         Rect rect = new Rect();
         unityView.getWindowVisibleDisplayFrame(rect);
 
+        //Log.i("UIWidgetsDebug", "calculation: " + unityView.getRootView().getHeight() + " " + rect.bottom + " " + rect.top);
+        
         rect.bottom = unityView.getRootView().getHeight() - (rect.bottom - rect.top) - rect.top;
         rect.right = unityView.getRootView().getWidth() - (rect.right - rect.left) - rect.left;
 
@@ -129,9 +131,6 @@ public void updateViewMetrics() {
         ZeroSides zeroSides = ZeroSides.NONE;
         if (navigationBarHidden) {
             zeroSides = calculateShouldZeroSides(unityView);
-        } else {
-            rect.bottom -= getNavigationBarHeight();
-            rect.bottom = rect.bottom > 0 ? rect.bottom : 0;
         }
 
         viewMetrics.padding_top = rect.top;
@@ -143,6 +142,10 @@ public void updateViewMetrics() {
         viewMetrics.insets_right = 0;
         viewMetrics.insets_bottom = navigationBarHidden? calculateBottomKeyboardInset(rect) : rect.bottom;
         viewMetrics.insets_left = 0;
+        
+        //Log.i("UIWidgetsDebug", "checks: " + navigationBarHidden + " " + rect.bottom);
+        //Log.i("UIWidgetsDebug", " padding: " + viewMetrics.padding_top + " " + viewMetrics.padding_right + " " + viewMetrics.padding_bottom + " " + viewMetrics.padding_left);
+        //Log.i("UIWidgetsDebug", " insets: " + viewMetrics.insets_top + " " + viewMetrics.insets_right + " " + viewMetrics.insets_bottom + " " + viewMetrics.insets_left);
     }
 
     public void setupViewMetricsChangedListener() {

Runtime/InternalBridge/NoAllocHelpersBridge.cs

@@ -65,12 +65,6 @@ -(void)keyboardWillChangeFrame:(NSNotification*)notification {
     CGFloat bottom = CGRectGetHeight([[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]);
     CGFloat scale = [UIScreen mainScreen].scale;
 
-    // scale == 3 => screen is 1242 * 2208 => we have to perform down-sampling to obtain the real length
-    // 0.8696 = 1920 / 2208, the vertical down-sampling ratio
-    if (scale == 3) {
-        bottom = bottom * 0.8696;
-    }
-
     viewInsets.bottom = bottom * scale;
     padding.bottom = 0;
 
@@ -100,14 +94,18 @@ 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;
+
+        CGFloat scale = [UIScreen mainScreen].scale;
+        BOOL needDownsample = scale == 3;
+
+        metrics.insets_bottom = needDownsample ? insets.bottom * 0.8696 : insets.bottom;
+        metrics.insets_top = needDownsample ? insets.top * 0.8696 : insets.top;
+        metrics.insets_left = needDownsample ? insets.left * 0.8696 : insets.left;
+        metrics.insets_right = needDownsample ? insets.right * 0.8696 : insets.right;
+        metrics.padding_bottom = needDownsample ? padding.bottom * 0.8696 : padding.bottom;
+        metrics.padding_top = needDownsample ? padding.top * 0.8696 : padding.top;
+        metrics.padding_left = needDownsample ? padding.left * 0.8696 : padding.left;
+        metrics.padding_right = needDownsample ? padding.right * 0.8696 : padding.right;
 
         return metrics;
     }