diff --git a/src/qml/utils.js b/src/qml/utils.js index aa661ef8..34b1724b 100644 --- a/src/qml/utils.js +++ b/src/qml/utils.js @@ -10,18 +10,6 @@ function hsluv(hue, saturation, lightness, alpha=1.0) { } -function hsl(hue, saturation, lightness) { - return hsla(hue, saturation, lightness) -} - - -function hsla(hue, saturation, lightness, alpha=1.0) { - // Convert standard hsla(0-360, 1-100, 1-100, 0-1) to Qt format - hue = numberWrapAround(hue, 360) - return Qt.hsla(hue / 360, saturation / 100, lightness / 100, alpha) -} - - function hueFrom(string) { // Calculate and return a unique hue between 0 and 360 for the string let hue = 0 @@ -33,7 +21,7 @@ function hueFrom(string) { function nameColor(name) { - return hsl( + return hsluv( hueFrom(name), theme.controls.displayName.saturation, theme.controls.displayName.lightness, diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl index 5908f485..7453564a 100644 --- a/src/themes/Default.qpl +++ b/src/themes/Default.qpl @@ -134,13 +134,13 @@ controls: real opacity: 1.0 letter: - int saturation: colors.saturation * 1.5 + int saturation: 10 + colors.saturation * 1.5 int lightness: colors.intensity * 60 real opacity: 1.0 displayName: - int saturation: colors.saturation - int lightness: Math.min(55, colors.intensity * 55) + int saturation: colors.saturation + 25 + int lightness: Math.min(60, colors.intensity * 60) // Special UI parts