diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-20 12:53:12 +0200 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2022-02-20 12:53:12 +0200 |
| commit | 6d7b6122e68c8d53b6e7533a6e5d5f55e33831e1 (patch) | |
| tree | 80bc2867510e3c9b7bc43578fc416165dae3876c /src/ui/color.c | |
| parent | 2d52f13afb15232cc9c834f0aa14284bf9072a31 (diff) | |
| parent | 41f378c4b46cb5dd3599d44c81fa51d3183eefee (diff) | |
Merge branch 'work/v1.11' into dev
# Conflicts:
# res/lang/es.bin
# res/lang/ie.bin
# res/lang/ru.bin
# res/lang/sr.bin
# res/lang/uk.bin
Diffstat (limited to 'src/ui/color.c')
| -rw-r--r-- | src/ui/color.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/color.c b/src/ui/color.c index 824342ae..9cba322d 100644 --- a/src/ui/color.c +++ b/src/ui/color.c | |||
| @@ -522,8 +522,8 @@ iHSLColor setLum_HSLColor(iHSLColor d, float lum) { | |||
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | iHSLColor addSatLum_HSLColor(iHSLColor d, float sat, float lum) { | 524 | iHSLColor addSatLum_HSLColor(iHSLColor d, float sat, float lum) { |
| 525 | d.sat = iClamp(d.sat + sat, 0, 1); | 525 | d.sat = iClamp(d.sat + sat, minSat_HSLColor, 1); |
| 526 | d.lum = iClamp(d.lum + lum, 0, 1); | 526 | d.lum = iClamp(d.lum + lum, minSat_HSLColor, 1); |
| 527 | return d; | 527 | return d; |
| 528 | } | 528 | } |
| 529 | 529 | ||