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

Author: zhuxingwei

Runtime/Plugins/platform/android/view/UIWidgetsViewController.java

@@ -34,17 +34,29 @@ public static UIWidgetsViewController getInstance() {
     private UIWidgetsViewMetrics viewMetrics;
     private boolean keyboardOpen;
 
+    private float statusHeight;
+    private float navigationBarHeight;
+    
     private void setup() {
         //Log.i("tag", "On Setup 2");
 
         keyboardOpen = false;
         viewMetrics = new UIWidgetsViewMetrics();
-        
+        setupHeights();
         updateViewMetrics();
 
         setupViewMetricsChangedListener();
     }
 
+    private void setupHeights() {
+        final View unityView = ((ViewGroup)UnityPlayer.currentActivity.findViewById(android.R.id.content)).getChildAt(0);
+        Rect rect = new Rect();
+        unityView.getWindowVisibleDisplayFrame(rect);
+        
+        statusHeight = rect.top;
+        navigationBarHeight = unityView.getRootView().getHeight() - rect.bottom;
+    }
+    
     public static UIWidgetsViewMetrics getMetrics() {
         UIWidgetsViewController controller = getInstance();
         return controller.viewMetrics;
@@ -143,6 +155,10 @@ public void updateViewMetrics() {
         viewMetrics.insets_bottom = navigationBarHidden? calculateBottomKeyboardInset(rect) : rect.bottom;
         viewMetrics.insets_left = 0;
 
+        //adjust
+        viewMetrics.insets_bottom -= navigationBarHeight;
+        viewMetrics.padding_top -= statusHeight;
+        
         //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);

Runtime/ui/txt/paragraph.cs

@@ -661,7 +661,8 @@ public void setParagraphStyle(ParagraphStyle style) {
 
         public List<TextBox> getRectsForRange(int start, int end) {
             var lineBoxes = new SplayTree<int, List<TextBox>>();
-            foreach (var run in this._codeUnitRuns) {
+            for (int runIndex = 0; runIndex < this._codeUnitRunsCount; runIndex++) {
+                var run = this._codeUnitRuns[runIndex];
                 if (run.codeUnits.start >= end) {
                     break;
                 }
@@ -784,7 +785,8 @@ internal PositionWithAffinity getGlyphPositionAtCoordinate(float dx, float dy) {
             }
 
             TextDirection direction = TextDirection.ltr;
-            foreach (var run in this._codeUnitRuns) {
+            for (int runIndex = 0; runIndex < this._codeUnitRunsCount; runIndex++) {
+                var run = this._codeUnitRuns[runIndex];
                 if (gp.codeUnit >= run.codeUnits.start && gp.codeUnit + 1 <= run.codeUnits.end) {
                     direction = run.direction;
                     break;