@@ -57,7 +57,7 @@ class RoundedRectangleBorder extends OutlinedBorder {
57
57
return _RoundedRectangleToCircleBorder (
58
58
side: BorderSide .lerp (a.side, side, t),
59
59
borderRadius: borderRadius,
60
- circleness : 1.0 - t,
60
+ circularity : 1.0 - t,
61
61
eccentricity: a.eccentricity,
62
62
);
63
63
}
@@ -77,7 +77,7 @@ class RoundedRectangleBorder extends OutlinedBorder {
77
77
return _RoundedRectangleToCircleBorder (
78
78
side: BorderSide .lerp (side, b.side, t),
79
79
borderRadius: borderRadius,
80
- circleness : t,
80
+ circularity : t,
81
81
eccentricity: b.eccentricity,
82
82
);
83
83
}
@@ -163,22 +163,22 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
163
163
const _RoundedRectangleToCircleBorder ({
164
164
super .side,
165
165
this .borderRadius = BorderRadius .zero,
166
- required this .circleness ,
166
+ required this .circularity ,
167
167
required this .eccentricity,
168
168
}) : assert (side != null ),
169
169
assert (borderRadius != null ),
170
- assert (circleness != null );
170
+ assert (circularity != null );
171
171
172
172
final BorderRadiusGeometry borderRadius;
173
- final double circleness ;
173
+ final double circularity ;
174
174
final double eccentricity;
175
175
176
176
@override
177
177
ShapeBorder scale (double t) {
178
178
return _RoundedRectangleToCircleBorder (
179
179
side: side.scale (t),
180
180
borderRadius: borderRadius * t,
181
- circleness : t,
181
+ circularity : t,
182
182
eccentricity: eccentricity,
183
183
);
184
184
}
@@ -190,23 +190,23 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
190
190
return _RoundedRectangleToCircleBorder (
191
191
side: BorderSide .lerp (a.side, side, t),
192
192
borderRadius: BorderRadiusGeometry .lerp (a.borderRadius, borderRadius, t)! ,
193
- circleness : circleness * t,
193
+ circularity : circularity * t,
194
194
eccentricity: eccentricity,
195
195
);
196
196
}
197
197
if (a is CircleBorder ) {
198
198
return _RoundedRectangleToCircleBorder (
199
199
side: BorderSide .lerp (a.side, side, t),
200
200
borderRadius: borderRadius,
201
- circleness : circleness + (1.0 - circleness ) * (1.0 - t),
201
+ circularity : circularity + (1.0 - circularity ) * (1.0 - t),
202
202
eccentricity: a.eccentricity,
203
203
);
204
204
}
205
205
if (a is _RoundedRectangleToCircleBorder ) {
206
206
return _RoundedRectangleToCircleBorder (
207
207
side: BorderSide .lerp (a.side, side, t),
208
208
borderRadius: BorderRadiusGeometry .lerp (a.borderRadius, borderRadius, t)! ,
209
- circleness : ui.lerpDouble (a.circleness, circleness , t)! ,
209
+ circularity : ui.lerpDouble (a.circularity, circularity , t)! ,
210
210
eccentricity: eccentricity,
211
211
);
212
212
}
@@ -219,36 +219,36 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
219
219
return _RoundedRectangleToCircleBorder (
220
220
side: BorderSide .lerp (side, b.side, t),
221
221
borderRadius: BorderRadiusGeometry .lerp (borderRadius, b.borderRadius, t)! ,
222
- circleness : circleness * (1.0 - t),
222
+ circularity : circularity * (1.0 - t),
223
223
eccentricity: eccentricity,
224
224
);
225
225
}
226
226
if (b is CircleBorder ) {
227
227
return _RoundedRectangleToCircleBorder (
228
228
side: BorderSide .lerp (side, b.side, t),
229
229
borderRadius: borderRadius,
230
- circleness : circleness + (1.0 - circleness ) * t,
230
+ circularity : circularity + (1.0 - circularity ) * t,
231
231
eccentricity: b.eccentricity,
232
232
);
233
233
}
234
234
if (b is _RoundedRectangleToCircleBorder ) {
235
235
return _RoundedRectangleToCircleBorder (
236
236
side: BorderSide .lerp (side, b.side, t),
237
237
borderRadius: BorderRadiusGeometry .lerp (borderRadius, b.borderRadius, t)! ,
238
- circleness : ui.lerpDouble (circleness , b.circleness , t)! ,
238
+ circularity : ui.lerpDouble (circularity , b.circularity , t)! ,
239
239
eccentricity: eccentricity,
240
240
);
241
241
}
242
242
return super .lerpTo (b, t);
243
243
}
244
244
245
245
Rect _adjustRect (Rect rect) {
246
- if (circleness == 0.0 || rect.width == rect.height) {
246
+ if (circularity == 0.0 || rect.width == rect.height) {
247
247
return rect;
248
248
}
249
249
if (rect.width < rect.height) {
250
250
final double partialDelta = (rect.height - rect.width) / 2 ;
251
- final double delta = circleness * partialDelta * (1.0 - eccentricity);
251
+ final double delta = circularity * partialDelta * (1.0 - eccentricity);
252
252
return Rect .fromLTRB (
253
253
rect.left,
254
254
rect.top + delta,
@@ -257,7 +257,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
257
257
);
258
258
} else {
259
259
final double partialDelta = (rect.width - rect.height) / 2 ;
260
- final double delta = circleness * partialDelta * (1.0 - eccentricity);
260
+ final double delta = circularity * partialDelta * (1.0 - eccentricity);
261
261
return Rect .fromLTRB (
262
262
rect.left + delta,
263
263
rect.top,
@@ -269,25 +269,25 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
269
269
270
270
BorderRadius ? _adjustBorderRadius (Rect rect, TextDirection ? textDirection) {
271
271
final BorderRadius resolvedRadius = borderRadius.resolve (textDirection);
272
- if (circleness == 0.0 ) {
272
+ if (circularity == 0.0 ) {
273
273
return resolvedRadius;
274
274
}
275
275
if (eccentricity != 0.0 ) {
276
276
if (rect.width < rect.height) {
277
277
return BorderRadius .lerp (
278
278
resolvedRadius,
279
279
BorderRadius .all (Radius .elliptical (rect.width / 2 , (0.5 + eccentricity / 2 ) * rect.height / 2 )),
280
- circleness ,
280
+ circularity ,
281
281
)! ;
282
282
} else {
283
283
return BorderRadius .lerp (
284
284
resolvedRadius,
285
285
BorderRadius .all (Radius .elliptical ((0.5 + eccentricity / 2 ) * rect.width / 2 , rect.height / 2 )),
286
- circleness ,
286
+ circularity ,
287
287
)! ;
288
288
}
289
289
}
290
- return BorderRadius .lerp (resolvedRadius, BorderRadius .circular (rect.shortestSide / 2 ), circleness );
290
+ return BorderRadius .lerp (resolvedRadius, BorderRadius .circular (rect.shortestSide / 2 ), circularity );
291
291
}
292
292
293
293
@override
@@ -318,11 +318,11 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
318
318
bool get preferPaintInterior => true ;
319
319
320
320
@override
321
- _RoundedRectangleToCircleBorder copyWith ({ BorderSide ? side, BorderRadiusGeometry ? borderRadius, double ? circleness , double ? eccentricity }) {
321
+ _RoundedRectangleToCircleBorder copyWith ({ BorderSide ? side, BorderRadiusGeometry ? borderRadius, double ? circularity , double ? eccentricity }) {
322
322
return _RoundedRectangleToCircleBorder (
323
323
side: side ?? this .side,
324
324
borderRadius: borderRadius ?? this .borderRadius,
325
- circleness : circleness ?? this .circleness ,
325
+ circularity : circularity ?? this .circularity ,
326
326
eccentricity: eccentricity ?? this .eccentricity,
327
327
);
328
328
}
@@ -347,17 +347,17 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
347
347
return other is _RoundedRectangleToCircleBorder
348
348
&& other.side == side
349
349
&& other.borderRadius == borderRadius
350
- && other.circleness == circleness ;
350
+ && other.circularity == circularity ;
351
351
}
352
352
353
353
@override
354
- int get hashCode => Object .hash (side, borderRadius, circleness );
354
+ int get hashCode => Object .hash (side, borderRadius, circularity );
355
355
356
356
@override
357
357
String toString () {
358
358
if (eccentricity != 0.0 ) {
359
- return 'RoundedRectangleBorder($side , $borderRadius , ${(circleness * 100 ).toStringAsFixed (1 )}% of the way to being a CircleBorder that is ${(eccentricity * 100 ).toStringAsFixed (1 )}% oval)' ;
359
+ return 'RoundedRectangleBorder($side , $borderRadius , ${(circularity * 100 ).toStringAsFixed (1 )}% of the way to being a CircleBorder that is ${(eccentricity * 100 ).toStringAsFixed (1 )}% oval)' ;
360
360
}
361
- return 'RoundedRectangleBorder($side , $borderRadius , ${(circleness * 100 ).toStringAsFixed (1 )}% of the way to being a CircleBorder)' ;
361
+ return 'RoundedRectangleBorder($side , $borderRadius , ${(circularity * 100 ).toStringAsFixed (1 )}% of the way to being a CircleBorder)' ;
362
362
}
363
363
}
0 commit comments