From 7aa7085d5f13ba752a6600a9f65de06be580d94b Mon Sep 17 00:00:00 2001 From: eylles Date: Sun, 20 Feb 2022 05:41:29 -0600 Subject: [PATCH] use 16 color adjust in fast_colorthief --- pywal/backends/fast_colorthief.py | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/pywal/backends/fast_colorthief.py b/pywal/backends/fast_colorthief.py index b68ff02..4d62b30 100644 --- a/pywal/backends/fast_colorthief.py +++ b/pywal/backends/fast_colorthief.py @@ -13,6 +13,7 @@ except ImportError: sys.exit(1) from .. import util +from .. import colors def gen_colors(img): @@ -22,29 +23,15 @@ def gen_colors(img): return [util.rgb_to_hex(color) for color in raw_colors] -def adjust(cols, light): +def adjust(cols, light, cols16): """Create palette.""" cols.sort(key=util.rgb_to_yiq) raw_colors = [*cols, *cols] - if light: - raw_colors[0] = util.lighten_color(cols[0], 0.90) - raw_colors[7] = util.darken_color(cols[0], 0.75) - - else: - for color in raw_colors: - color = util.lighten_color(color, 0.40) - - raw_colors[0] = util.darken_color(cols[0], 0.80) - raw_colors[7] = util.lighten_color(cols[0], 0.60) - - raw_colors[8] = util.lighten_color(cols[0], 0.20) - raw_colors[15] = raw_colors[7] - - return raw_colors + return colors.generic_adjust(raw_colors, light, cols16) -def get(img, light=False): +def get(img, light=False, cols16=False): """Get colorscheme.""" cols = gen_colors(img) - return adjust(cols, light) + return adjust(cols, light, cols16)