From fbe14b810281730d774c316cc95b23ea54f675d8 Mon Sep 17 00:00:00 2001 From: jonathan Date: Wed, 30 Jun 2021 21:33:53 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bugs=20in=20darker()=20and?= =?UTF-8?q?=20brighter()=20methods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/desktop/graphics/drawing/style/Color.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kivakit-ui/desktop/src/main/java/com/telenav/kivakit/ui/desktop/graphics/drawing/style/Color.java b/kivakit-ui/desktop/src/main/java/com/telenav/kivakit/ui/desktop/graphics/drawing/style/Color.java index b97016a57..20d86ac75 100644 --- a/kivakit-ui/desktop/src/main/java/com/telenav/kivakit/ui/desktop/graphics/drawing/style/Color.java +++ b/kivakit-ui/desktop/src/main/java/com/telenav/kivakit/ui/desktop/graphics/drawing/style/Color.java @@ -241,11 +241,11 @@ public Color brighter() public Color brighter(final Percent percent) { - final var factor = percent.inverse().asZeroToOne(); final var copy = new Color(this); - copy.red = Math.min((int) (red() * factor), 255); - copy.green = Math.min((int) (green() * factor), 255); - copy.blue = Math.min((int) (blue() * factor), 255); + final var scaleFactor = 1.0 + percent.asZeroToOne(); + copy.red = Math.min((int) (red() * scaleFactor), 255); + copy.green = Math.min((int) (green() * scaleFactor), 255); + copy.blue = Math.min((int) (blue() * scaleFactor), 255); return copy; } @@ -256,11 +256,11 @@ public Color darker() public Color darker(final Percent percent) { - final var factor = percent.inverse().asZeroToOne(); final var copy = new Color(this); - copy.red = Math.max((int) (red() * factor), 0); - copy.green = Math.max((int) (green() * factor), 0); - copy.blue = Math.max((int) (blue() * factor), 0); + final var scaleFactor = 1.0 - percent.asZeroToOne(); + copy.red = Math.max((int) (red() * scaleFactor), 0); + copy.green = Math.max((int) (green() * scaleFactor), 0); + copy.blue = Math.max((int) (blue() * scaleFactor), 0); return copy; }