@wcardinal/wcardinal-ui 0.394.0 → 0.395.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.394.0
+ Winter Cardinal UI v0.395.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -11901,7 +11901,7 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
             var w = this._width;
             var h = this._height;
             var r = Math.min(0.5 * w, 0.5 * h, this._cornerRadius);
-            var a = 1 / resolution;
+            var a = 0.5 / resolution;
             var x0 = 0;
             var x1 = r;
             var x2 = w - r;
@@ -11934,7 +11934,7 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
                 this.fillVertices(vertices, uvs, iv, iuv, n, x1, y1, r, a, tlt);
             }
             else {
-                this.fillVertices(vertices, uvs, iv, iuv, n, x0, y0, 0, 0, tlt);
+                this.fillVertices(vertices, uvs, iv, iuv, n, x0, y0, 0, a, tlt);
             }
             this.fillIndices(indices, ia, ii, n);
             iv += n4;
@@ -11946,7 +11946,7 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
                 this.fillVertices(vertices, uvs, iv, iuv, n, x2, y1, r, a, ttr);
             }
             else {
-                this.fillVertices(vertices, uvs, iv, iuv, n, x3, y0, 0, 0, ttr);
+                this.fillVertices(vertices, uvs, iv, iuv, n, x3, y0, 0, a, ttr);
             }
             this.fillIndices(indices, ia, ii, n);
             iv += n4;
@@ -11958,7 +11958,7 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
                 this.fillVertices(vertices, uvs, iv, iuv, n, x2, y2, r, a, trb);
             }
             else {
-                this.fillVertices(vertices, uvs, iv, iuv, n, x3, y3, 0, 0, trb);
+                this.fillVertices(vertices, uvs, iv, iuv, n, x3, y3, 0, a, trb);
             }
             this.fillIndices(indices, ia, ii, n);
             iv += n4;
@@ -11970,7 +11970,7 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
                 this.fillVertices(vertices, uvs, iv, iuv, n, x1, y2, r, a, tbl);
             }
             else {
-                this.fillVertices(vertices, uvs, iv, iuv, n, x0, y3, 0, 0, tbl);
+                this.fillVertices(vertices, uvs, iv, iuv, n, x0, y3, 0, a, tbl);
             }
             this.fillIndicesEnd(indices, ia, ii, n);
             iv += n4;
@@ -12156,30 +12156,53 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
         var r3 = r2 + dr;
         var cos = table.cos;
         var sin = table.sin;
-        if (r0 < 0) {
-            var m = n >> 1;
-            var c0 = cos[m];
-            var s0 = sin[m];
-            if (r1 < 0) {
-                for (var i = 0; i < n; ++i) {
-                    var c = cos[i];
-                    var s = sin[i];
-                    vertices[++iv] = x + c0 * r0;
-                    vertices[++iv] = y + s0 * r0;
-                    vertices[++iv] = x + c0 * r1;
-                    vertices[++iv] = y + s0 * r1;
-                    vertices[++iv] = x + c * r2;
-                    vertices[++iv] = y + s * r2;
-                    vertices[++iv] = x + c * r3;
-                    vertices[++iv] = y + s * r3;
-                    uvs[++iuv] = 0.5 * (1 + c);
-                    uvs[++iuv] = 0.5 * (1 + s);
-                    uvs[++iuv] = 0.5;
-                    uvs[++iuv] = 0.5;
-                    uvs[++iuv] = 0.5;
-                    uvs[++iuv] = 0.5;
-                    uvs[++iuv] = 0.5 * (1 + c);
-                    uvs[++iuv] = 0.5 * (1 + s);
+        if (r0 <= 0) {
+            var c0 = cos[0] + cos[n - 1];
+            var s0 = sin[0] + sin[n - 1];
+            if (r1 <= 0) {
+                if (r <= 0) {
+                    for (var i = 0; i < n; ++i) {
+                        var c = cos[i];
+                        var s = sin[i];
+                        vertices[++iv] = x + c0 * r0;
+                        vertices[++iv] = y + s0 * r0;
+                        vertices[++iv] = x + c0 * r1;
+                        vertices[++iv] = y + s0 * r1;
+                        vertices[++iv] = x + c0 * r2;
+                        vertices[++iv] = y + s0 * r2;
+                        vertices[++iv] = x + c0 * r3;
+                        vertices[++iv] = y + s0 * r3;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                    }
+                }
+                else {
+                    for (var i = 0; i < n; ++i) {
+                        var c = cos[i];
+                        var s = sin[i];
+                        vertices[++iv] = x + c0 * r0;
+                        vertices[++iv] = y + s0 * r0;
+                        vertices[++iv] = x + c0 * r1;
+                        vertices[++iv] = y + s0 * r1;
+                        vertices[++iv] = x + c * r2;
+                        vertices[++iv] = y + s * r2;
+                        vertices[++iv] = x + c * r3;
+                        vertices[++iv] = y + s * r3;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                    }
                 }
             }
             else {
@@ -12336,7 +12359,7 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
             var h = this._height;
             var bw = this._borderWidth;
             var r = Math.min(0.5 * w, 0.5 * h, this._cornerRadius);
-            var a = 1 / resolution;
+            var a = 0.5 / resolution;
             var x0 = 0;
             var x1 = r;
             var x2 = w - r;
@@ -12375,15 +12398,15 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
                     this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, a, bw, tlt);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, 0, 0, tlt);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, a, 0, tlt);
                 }
             }
             else {
                 if (bl || bt) {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, 0, bw, tlt);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, a, bw, tlt);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, 0, 0, tlt);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, a, 0, tlt);
                 }
             }
             this.fillIndices(indices, ia, ii, n, bt, false);
@@ -12397,15 +12420,15 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
                     this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, a, bw, ttr);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, 0, 0, ttr);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, a, 0, ttr);
                 }
             }
             else {
                 if (bt || br) {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, 0, bw, ttr);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, a, bw, ttr);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, 0, 0, ttr);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, a, 0, ttr);
                 }
             }
             this.fillIndices(indices, ia, ii, n, br, false);
@@ -12419,15 +12442,15 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
                     this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, a, bw, trb);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, 0, 0, trb);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, a, 0, trb);
                 }
             }
             else {
                 if (br || bb) {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, 0, bw, trb);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, a, bw, trb);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, 0, 0, trb);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, a, 0, trb);
                 }
             }
             this.fillIndices(indices, ia, ii, n, bb, false);
@@ -12441,15 +12464,15 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
                     this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, a, bw, tbl);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, 0, 0, tbl);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, a, 0, tbl);
                 }
             }
             else {
                 if (bb || bl) {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, 0, bw, tbl);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, a, bw, tbl);
                 }
                 else {
-                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, 0, 0, tbl);
+                    this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, a, 0, tbl);
                 }
             }
             this.fillIndices(indices, ia, ii, n, bl, true);
@@ -12648,7 +12671,7 @@ var DBaseOutlineSnippet = /** @class */ (function () {
                 outlineMesh.y = -outlineOffset;
                 outlineMesh.width = width + outlineOffset * 2;
                 outlineMesh.height = height + outlineOffset * 2;
-                outlineMesh.cornerRadius = cornerRadius;
+                outlineMesh.cornerRadius = Math.max(0, cornerRadius + outlineOffset);
                 outlineMesh.cornerMask = cornerMask;
                 outlineMesh.borderWidth = outlineWidth;
                 outlineMesh.borderMask = outlineMask;
@@ -47386,7 +47409,7 @@ var DThemeWhiteButtonBase = /** @class */ (function (_super) {
         return this.getOutlineOffsetNonActive(state);
     };
     DThemeWhiteButtonBase.prototype.getOutlineOffsetActive = function (state) {
-        return -1.5;
+        return -1;
     };
     DThemeWhiteButtonBase.prototype.getOutlineOffsetNonActive = function (state) {
         return _super.prototype.getOutlineOffset.call(this, state);
@@ -49700,7 +49723,7 @@ var DThemeWhiteInput = /** @class */ (function (_super) {
         return true;
     };
     DThemeWhiteInput.prototype.getElementStyleBorder = function (state) {
-        return "border: 1px solid transparent; box-sizing: border-box;";
+        return "border: 1.5px solid transparent; box-sizing: border-box;";
     };
     return DThemeWhiteInput;
 }(DThemeWhiteHtmlElement));
@@ -55188,9 +55211,6 @@ var DThemeWhiteInputBooleanButtonOff = /** @class */ (function (_super) {
     function DThemeWhiteInputBooleanButtonOff() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DThemeWhiteInputBooleanButtonOff.prototype.getBorderMask = function () {
-        return DBorderMask.RIGHT;
-    };
     DThemeWhiteInputBooleanButtonOff.prototype.isToggle = function () {
         return true;
     };
@@ -55221,9 +55241,6 @@ var DThemeWhiteInputBooleanButtonOn = /** @class */ (function (_super) {
     function DThemeWhiteInputBooleanButtonOn() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DThemeWhiteInputBooleanButtonOn.prototype.getBorderMask = function () {
-        return DBorderMask.LEFT;
-    };
     DThemeWhiteInputBooleanButtonOn.prototype.isToggle = function () {
         return true;
     };
@@ -58377,7 +58394,7 @@ var DThemeDarkButtonBase = /** @class */ (function (_super) {
         return this.getOutlineOffsetNonActive(state);
     };
     DThemeDarkButtonBase.prototype.getOutlineOffsetActive = function (state) {
-        return -1.5;
+        return -1;
     };
     DThemeDarkButtonBase.prototype.getOutlineOffsetNonActive = function (state) {
         return _super.prototype.getOutlineOffset.call(this, state);
@@ -60554,7 +60571,7 @@ var DThemeDarkInput = /** @class */ (function (_super) {
         return true;
     };
     DThemeDarkInput.prototype.getElementStyleBorder = function (state) {
-        return "border: 1px solid transparent; box-sizing: border-box;";
+        return "border: 1.5px solid transparent; box-sizing: border-box;";
     };
     return DThemeDarkInput;
 }(DThemeDarkHtmlElement));
@@ -65574,9 +65591,6 @@ var DThemeDarkInputBooleanButtonOff = /** @class */ (function (_super) {
     function DThemeDarkInputBooleanButtonOff() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DThemeDarkInputBooleanButtonOff.prototype.getBorderMask = function () {
-        return DBorderMask.RIGHT;
-    };
     DThemeDarkInputBooleanButtonOff.prototype.isToggle = function () {
         return true;
     };
@@ -65607,9 +65621,6 @@ var DThemeDarkInputBooleanButtonOn = /** @class */ (function (_super) {
     function DThemeDarkInputBooleanButtonOn() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DThemeDarkInputBooleanButtonOn.prototype.getBorderMask = function () {
-        return DBorderMask.LEFT;
-    };
     DThemeDarkInputBooleanButtonOn.prototype.isToggle = function () {
         return true;
     };

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.394.0
+ Winter Cardinal UI v0.395.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -11898,7 +11898,7 @@
                 var w = this._width;
                 var h = this._height;
                 var r = Math.min(0.5 * w, 0.5 * h, this._cornerRadius);
-                var a = 1 / resolution;
+                var a = 0.5 / resolution;
                 var x0 = 0;
                 var x1 = r;
                 var x2 = w - r;
@@ -11931,7 +11931,7 @@
                     this.fillVertices(vertices, uvs, iv, iuv, n, x1, y1, r, a, tlt);
                 }
                 else {
-                    this.fillVertices(vertices, uvs, iv, iuv, n, x0, y0, 0, 0, tlt);
+                    this.fillVertices(vertices, uvs, iv, iuv, n, x0, y0, 0, a, tlt);
                 }
                 this.fillIndices(indices, ia, ii, n);
                 iv += n4;
@@ -11943,7 +11943,7 @@
                     this.fillVertices(vertices, uvs, iv, iuv, n, x2, y1, r, a, ttr);
                 }
                 else {
-                    this.fillVertices(vertices, uvs, iv, iuv, n, x3, y0, 0, 0, ttr);
+                    this.fillVertices(vertices, uvs, iv, iuv, n, x3, y0, 0, a, ttr);
                 }
                 this.fillIndices(indices, ia, ii, n);
                 iv += n4;
@@ -11955,7 +11955,7 @@
                     this.fillVertices(vertices, uvs, iv, iuv, n, x2, y2, r, a, trb);
                 }
                 else {
-                    this.fillVertices(vertices, uvs, iv, iuv, n, x3, y3, 0, 0, trb);
+                    this.fillVertices(vertices, uvs, iv, iuv, n, x3, y3, 0, a, trb);
                 }
                 this.fillIndices(indices, ia, ii, n);
                 iv += n4;
@@ -11967,7 +11967,7 @@
                     this.fillVertices(vertices, uvs, iv, iuv, n, x1, y2, r, a, tbl);
                 }
                 else {
-                    this.fillVertices(vertices, uvs, iv, iuv, n, x0, y3, 0, 0, tbl);
+                    this.fillVertices(vertices, uvs, iv, iuv, n, x0, y3, 0, a, tbl);
                 }
                 this.fillIndicesEnd(indices, ia, ii, n);
                 iv += n4;
@@ -12153,30 +12153,53 @@
             var r3 = r2 + dr;
             var cos = table.cos;
             var sin = table.sin;
-            if (r0 < 0) {
-                var m = n >> 1;
-                var c0 = cos[m];
-                var s0 = sin[m];
-                if (r1 < 0) {
-                    for (var i = 0; i < n; ++i) {
-                        var c = cos[i];
-                        var s = sin[i];
-                        vertices[++iv] = x + c0 * r0;
-                        vertices[++iv] = y + s0 * r0;
-                        vertices[++iv] = x + c0 * r1;
-                        vertices[++iv] = y + s0 * r1;
-                        vertices[++iv] = x + c * r2;
-                        vertices[++iv] = y + s * r2;
-                        vertices[++iv] = x + c * r3;
-                        vertices[++iv] = y + s * r3;
-                        uvs[++iuv] = 0.5 * (1 + c);
-                        uvs[++iuv] = 0.5 * (1 + s);
-                        uvs[++iuv] = 0.5;
-                        uvs[++iuv] = 0.5;
-                        uvs[++iuv] = 0.5;
-                        uvs[++iuv] = 0.5;
-                        uvs[++iuv] = 0.5 * (1 + c);
-                        uvs[++iuv] = 0.5 * (1 + s);
+            if (r0 <= 0) {
+                var c0 = cos[0] + cos[n - 1];
+                var s0 = sin[0] + sin[n - 1];
+                if (r1 <= 0) {
+                    if (r <= 0) {
+                        for (var i = 0; i < n; ++i) {
+                            var c = cos[i];
+                            var s = sin[i];
+                            vertices[++iv] = x + c0 * r0;
+                            vertices[++iv] = y + s0 * r0;
+                            vertices[++iv] = x + c0 * r1;
+                            vertices[++iv] = y + s0 * r1;
+                            vertices[++iv] = x + c0 * r2;
+                            vertices[++iv] = y + s0 * r2;
+                            vertices[++iv] = x + c0 * r3;
+                            vertices[++iv] = y + s0 * r3;
+                            uvs[++iuv] = 0.5 * (1 + c);
+                            uvs[++iuv] = 0.5 * (1 + s);
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5 * (1 + c);
+                            uvs[++iuv] = 0.5 * (1 + s);
+                        }
+                    }
+                    else {
+                        for (var i = 0; i < n; ++i) {
+                            var c = cos[i];
+                            var s = sin[i];
+                            vertices[++iv] = x + c0 * r0;
+                            vertices[++iv] = y + s0 * r0;
+                            vertices[++iv] = x + c0 * r1;
+                            vertices[++iv] = y + s0 * r1;
+                            vertices[++iv] = x + c * r2;
+                            vertices[++iv] = y + s * r2;
+                            vertices[++iv] = x + c * r3;
+                            vertices[++iv] = y + s * r3;
+                            uvs[++iuv] = 0.5 * (1 + c);
+                            uvs[++iuv] = 0.5 * (1 + s);
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5;
+                            uvs[++iuv] = 0.5 * (1 + c);
+                            uvs[++iuv] = 0.5 * (1 + s);
+                        }
                     }
                 }
                 else {
@@ -12333,7 +12356,7 @@
                 var h = this._height;
                 var bw = this._borderWidth;
                 var r = Math.min(0.5 * w, 0.5 * h, this._cornerRadius);
-                var a = 1 / resolution;
+                var a = 0.5 / resolution;
                 var x0 = 0;
                 var x1 = r;
                 var x2 = w - r;
@@ -12372,15 +12395,15 @@
                         this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, a, bw, tlt);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, 0, 0, tlt);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y1, r, a, 0, tlt);
                     }
                 }
                 else {
                     if (bl || bt) {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, 0, bw, tlt);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, a, bw, tlt);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, 0, 0, tlt);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y0, 0, a, 0, tlt);
                     }
                 }
                 this.fillIndices(indices, ia, ii, n, bt, false);
@@ -12394,15 +12417,15 @@
                         this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, a, bw, ttr);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, 0, 0, ttr);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y1, r, a, 0, ttr);
                     }
                 }
                 else {
                     if (bt || br) {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, 0, bw, ttr);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, a, bw, ttr);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, 0, 0, ttr);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y0, 0, a, 0, ttr);
                     }
                 }
                 this.fillIndices(indices, ia, ii, n, br, false);
@@ -12416,15 +12439,15 @@
                         this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, a, bw, trb);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, 0, 0, trb);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x2, y2, r, a, 0, trb);
                     }
                 }
                 else {
                     if (br || bb) {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, 0, bw, trb);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, a, bw, trb);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, 0, 0, trb);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x3, y3, 0, a, 0, trb);
                     }
                 }
                 this.fillIndices(indices, ia, ii, n, bb, false);
@@ -12438,15 +12461,15 @@
                         this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, a, bw, tbl);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, 0, 0, tbl);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x1, y2, r, a, 0, tbl);
                     }
                 }
                 else {
                     if (bb || bl) {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, 0, bw, tbl);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, a, bw, tbl);
                     }
                     else {
-                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, 0, 0, tbl);
+                        this.fillVertices(vrtcs, uvs, iv, iuv, n, x0, y3, 0, a, 0, tbl);
                     }
                 }
                 this.fillIndices(indices, ia, ii, n, bl, true);
@@ -12645,7 +12668,7 @@
                     outlineMesh.y = -outlineOffset;
                     outlineMesh.width = width + outlineOffset * 2;
                     outlineMesh.height = height + outlineOffset * 2;
-                    outlineMesh.cornerRadius = cornerRadius;
+                    outlineMesh.cornerRadius = Math.max(0, cornerRadius + outlineOffset);
                     outlineMesh.cornerMask = cornerMask;
                     outlineMesh.borderWidth = outlineWidth;
                     outlineMesh.borderMask = outlineMask;