fix image slice bug

Author: zhuxingwei

Runtime/ui/renderer/cmdbufferCanvas/rendering/canvas_impl.cs

@@ -281,7 +281,7 @@ void _setMatrix(uiMatrix3 matrix) {
 
         void _clipRect(Rect rect) {
             var path = uiPath.create();
-            path.addRect(uiRectHelper.fromRect(rect));
+            path.addRect(uiRectHelper.fromRect(rect).Value);
             this._clipPath(path);
             uiPathCacheManager.putToCache(path);
         }
@@ -771,7 +771,7 @@ void _drawPicture(Picture picture, bool needsSave = true) {
                         break;
                     case DrawSaveLayer cmd: {
                         saveCount++;
-                        this._saveLayer(uiRectHelper.fromRect(cmd.rect), uiPaint.fromPaint(cmd.paint));
+                        this._saveLayer(uiRectHelper.fromRect(cmd.rect).Value, uiPaint.fromPaint(cmd.paint));
                         break;
                     }
 
@@ -849,14 +849,14 @@ void _drawPicture(Picture picture, bool needsSave = true) {
                     }
 
                     case DrawImageRect cmd: {
-                        this._drawImageRect(cmd.image, uiRectHelper.fromRect(cmd.src), uiRectHelper.fromRect(cmd.dst),
+                        this._drawImageRect(cmd.image, uiRectHelper.fromRect(cmd.src), uiRectHelper.fromRect(cmd.dst).Value,
                             uiPaint.fromPaint(cmd.paint));
                         break;
                     }
 
                     case DrawImageNine cmd: {
                         this._drawImageNine(cmd.image, uiRectHelper.fromRect(cmd.src),
-                            uiRectHelper.fromRect(cmd.center), uiRectHelper.fromRect(cmd.dst),
+                            uiRectHelper.fromRect(cmd.center).Value, uiRectHelper.fromRect(cmd.dst).Value,
                             uiPaint.fromPaint(cmd.paint));
                         break;
                     }
@@ -1019,7 +1019,7 @@ void _drawTextBlob(TextBlob? textBlob, uiOffset offset, uiPaint paint) {
             matrix.preTranslate(offset.dx, offset.dy);
 
             var mesh = TextBlobMesh.create(textBlob.Value, scale, matrix);
-            var textBlobBounds = matrix.mapRect(uiRectHelper.fromRect(textBlob.Value.boundsInText));
+            var textBlobBounds = matrix.mapRect(uiRectHelper.fromRect(textBlob.Value.boundsInText).Value);
 
             // request font texture so text mesh could be generated correctly
             var style = textBlob.Value.style;

Runtime/ui/renderer/common/geometry/rect.cs

@@ -95,7 +95,10 @@ public uiRect expandToInclude(uiRect? other) {
     }
 
     public static class uiRectHelper {
-        public static uiRect fromRect(Rect rect) {
+        public static uiRect? fromRect(Rect rect) {
+            if (rect == null) {
+                return null;
+            }
             return new uiRect(rect.left, rect.top, rect.right, rect.bottom);
         }
 

Runtime/ui/renderer/common/picture.cs

@@ -170,7 +170,7 @@ public void addDrawCmd(uiDrawCmd drawCmd) {
                 case uiDrawClipRRect cmd: {
                     var state = this._getState();
 
-                    var rect = state.xform.mapRect(uiRectHelper.fromRect(cmd.rrect.outerRect));
+                    var rect = state.xform.mapRect(uiRectHelper.fromRect(cmd.rrect.outerRect).Value);
                     state.scissor = state.scissor == null ? rect : state.scissor.Value.intersect(rect);
                     this._setState(state);
                     break;
@@ -258,15 +258,15 @@ public void addDrawCmd(uiDrawCmd drawCmd) {
                 }
                 case uiDrawPicture cmd: {
                     var state = this._getState();
-                    var rect = state.xform.mapRect(uiRectHelper.fromRect(cmd.picture.paintBounds));
+                    var rect = state.xform.mapRect(uiRectHelper.fromRect(cmd.picture.paintBounds).Value);
                     this._addPaintBounds(rect);
                     break;
                 }
                 case uiDrawTextBlob cmd: {
                     var state = this._getState();
                     var scale = uiXformUtils.getScale(state.xform);
                     var rect = uiRectHelper.fromRect(
-                        cmd.textBlob.Value.shiftedBoundsInText(cmd.offset.Value.dx, cmd.offset.Value.dy));
+                        cmd.textBlob.Value.shiftedBoundsInText(cmd.offset.Value.dx, cmd.offset.Value.dy)).Value;
                     rect = state.xform.mapRect(rect);
 
                     var paint = cmd.paint;