Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

min/max opacity to prevent Flutter exception #15 #18

Merged
merged 2 commits into from
Dec 15, 2018
Merged

min/max opacity to prevent Flutter exception #15 #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
974f542
min/max opacity to prevent Flutter exception #15
umberto-sonnino Dec 14, 2018
c88556f
Clamping instead of min/max
umberto-sonnino Dec 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lib/flare.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class FlutterActorShape extends ActorShape {
}
if (overrideColor != null) {
paint.color = overrideColor
.withOpacity(overrideColor.opacity * paint.color.opacity);
.withOpacity((overrideColor.opacity * paint.color.opacity).clamp(0.0, 1.0));
}
canvas.drawPath(renderPath, paint);
}
Expand All @@ -142,7 +142,7 @@ class FlutterActorShape extends ActorShape {
}
if (overrideColor != null) {
paint.color = overrideColor
.withOpacity(overrideColor.opacity * paint.color.opacity);
.withOpacity((overrideColor.opacity * paint.color.opacity).clamp(0.0, 1.0));
}
canvas.drawPath(renderPath, paint);
}
Expand Down Expand Up @@ -235,8 +235,9 @@ class FlutterGradientFill extends GradientFill implements FlutterFill {
stops.add(colorStops[idx + 4]);
idx += 5;
}

ui.Paint paint = ui.Paint()
..color = Colors.white.withOpacity(modulateOpacity * opacity)
..color = Colors.white.withOpacity((modulateOpacity*opacity).clamp(0.0, 1.0))
..shader = ui.Gradient.linear(ui.Offset(renderStart[0], renderStart[1]),
ui.Offset(renderEnd[0], renderEnd[1]), colors, stops)
..style = ui.PaintingStyle.fill;
Expand Down Expand Up @@ -278,7 +279,7 @@ class FlutterGradientStroke extends GradientStroke implements FlutterStroke {
}

ui.Paint paint = ui.Paint()
..color = Colors.white.withOpacity(modulateOpacity * opacity)
..color = Colors.white.withOpacity((modulateOpacity*opacity).clamp(0.0, 1.0))
..shader = ui.Gradient.linear(ui.Offset(renderStart[0], renderStart[1]),
ui.Offset(renderEnd[0], renderEnd[1]), colors, stops)
..strokeWidth = width
Expand Down Expand Up @@ -348,8 +349,9 @@ class FlutterRadialFill extends RadialGradientFill implements FlutterFill {
colors,
stops,
ui.TileMode.clamp); //, transform.mat4);

ui.Paint paint = ui.Paint()
..color = Colors.white.withOpacity(modulateOpacity * opacity)
..color = Colors.white.withOpacity((modulateOpacity*opacity).clamp(0.0, 1.0))
..shader = radial
..style = ui.PaintingStyle.fill;

Expand Down Expand Up @@ -413,8 +415,9 @@ class FlutterRadialStroke extends RadialGradientStroke
stops.add(colorStops[idx + 4]);
idx += 5;
}

return ui.Paint()
..color = Colors.white.withOpacity(modulateOpacity * opacity)
..color = Colors.white.withOpacity((modulateOpacity*opacity).clamp(0.0, 1.0))
..shader = ui.Gradient.radial(Offset(renderStart[0], renderStart[1]),
radius, colors, stops, ui.TileMode.clamp) //, transform.mat4)
// ..shader = new ui.Gradient.radial(new ui.Offset(center[0], center[1]), radius, colors, stops)
Expand Down