Use same lightness calculation as the SCSS compiler for theming

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 286756a4849e91f71c3ef5d564f8d14c3049ad66..e5fa90cb344322daaf6226558be07cce79495b54 100644 (file)
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -30,6 +30,7 @@ use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
 use OCP\Files\IRootFolder;
+use Leafo\ScssPhp\Compiler;
 
 class Util {
 
@@ -95,10 +96,12 @@ class Util {
                if (strlen($hex) !== 6) {
                        return 0;
                }
-               $r = hexdec(substr($hex, 0, 2));
-               $g = hexdec(substr($hex, 2, 2));
-               $b = hexdec(substr($hex, 4, 2));
-               return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
+               $red = hexdec(substr($hex, 0, 2));
+               $green = hexdec(substr($hex, 2, 2));
+               $blue = hexdec(substr($hex, 4, 2));
+               $compiler = new Compiler();
+               $hsl = $compiler->toHSL($red, $green, $blue);
+               return $hsl[3]/100;
        }
 
        /**