Skip to content

Fixes issues #2, #6, and #10 on FooStudio/tinycolor #5

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

Merged
calvintam236 merged 1 commit into from
Jun 25, 2021
Merged

Fixes issues #2, #6, and #10 on FooStudio/tinycolor #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions lib/tinycolor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ class TinyColor {
}

TinyColor tint([int amount = 10]) {
return this.mix(input: Color.fromRGBO(255, 255, 255, 1.0));
return this.mix(input: Color.fromRGBO(255, 255, 255, 1.0), amount: amount);
}

TinyColor shade([int amount = 10]) {
return this.mix(input: Color.fromRGBO(0, 0, 0, 1.0));
return this.mix(input: Color.fromRGBO(0, 0, 0, 1.0), amount: amount);
}

TinyColor desaturate([int amount = 10]) {
Expand Down Expand Up @@ -143,12 +143,12 @@ class TinyColor {
}

TinyColor mix({@required Color input, int amount = 50}) {
final int p = (amount / 100).round();
final p = amount / 100.0;
final color = Color.fromARGB(
(input.alpha - _color.alpha) * p + _color.alpha,
(input.red - _color.red) * p + _color.red,
(input.green - _color.green) * p + _color.green,
(input.blue - _color.blue) * p + _color.blue);
((input.alpha - _color.alpha) * p + _color.alpha).round(),
((input.red - _color.red) * p + _color.red).round(),
((input.green - _color.green) * p + _color.green).round(),
((input.blue - _color.blue) * p + _color.blue).round());
return TinyColor(color);
}

Expand Down