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

# Conflicts:
#	Runtime/ui/painting/picture.cs

Author: zhuxingwei

Runtime/ui/painting/canvas.cs

@@ -99,9 +99,11 @@ public void saveLayer(Rect rect, Paint paint) {
         }
 
         public void restore() {
-            this._saveCount--;
-            this._recorder.addDrawCmd(new DrawRestore {
-            });
+            if (this._saveCount > 1) {
+                this._saveCount--;
+                this._recorder.addDrawCmd(new DrawRestore {
+                });
+            }
         }
 
         public int getSaveCount() {

Runtime/ui/painting/picture.cs

@@ -68,7 +68,32 @@ public void reset() {
             this._stateUpdateIndices.Clear();
         }
 
+        void restoreToCount(int count) {
+            count = this._states.Count - count;
+            while (count > 0) {
+                this.addDrawCmd(new DrawRestore());
+                count--;
+            }
+        }
+
+        void restore() {
+            var stateToRestore = this._getState();
+            this._states.RemoveAt(this._states.Count - 1);
+            var state = this._getState();
+
+            if (!stateToRestore.saveLayer) {
+                state.paintBounds = stateToRestore.paintBounds;
+            }
+            else {
+                var paintBounds = stateToRestore.paintBounds.shift(stateToRestore.layerOffset);
+                paintBounds = state.xform.mapRect(paintBounds);
+                this._addPaintBounds(paintBounds);
+            }
+        }
+
         public Picture endRecording() {
+            this.restoreToCount(1);
+            
             if (this._states.Count > 1) {
                 throw new Exception("unmatched save/restore commands");
             }
@@ -103,20 +128,11 @@ public void addDrawCmd(DrawCmd drawCmd) {
                 }
 
                 case DrawRestore _: {
-                    var stateToRestore = this._getState();
-                    this._states.RemoveAt(this._states.Count - 1);
-                    var state = this._getState();
-
-                    if (!stateToRestore.saveLayer) {
-                        state.paintBounds = stateToRestore.paintBounds;
+                    //check for underflow
+                    if (this._states.Count > 1) {
+                        this.restore();
+                        this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
                     }
-                    else {
-                        var paintBounds = stateToRestore.paintBounds.shift(stateToRestore.layerOffset);
-                        paintBounds = state.xform.mapRect(paintBounds);
-                        this._addPaintBounds(paintBounds);
-                    }
-                    this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
-
                     break;
                 }