From f86ffb48c6e7d5126f58de0786d5ad0cd0b74966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Sun, 14 Mar 2021 21:12:12 +0100 Subject: [PATCH] Fix colour picker colour square broken by 4b7e85c --- src/gui/colourpicker/ColourPickerActivity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/colourpicker/ColourPickerActivity.cpp b/src/gui/colourpicker/ColourPickerActivity.cpp index 8e0836d9c..4a8c370c0 100644 --- a/src/gui/colourpicker/ColourPickerActivity.cpp +++ b/src/gui/colourpicker/ColourPickerActivity.cpp @@ -261,7 +261,7 @@ void ColourPickerActivity::OnDraw() { for(int hue = 0; hue <= 359; hue++) { - currx = int(restrict_flt(float(hue), 0, 359))+offsetX; + currx = clamp_flt(float(hue), 0, 359)+offsetX; if (currx == lastx) continue; lastx = currx; @@ -286,7 +286,7 @@ void ColourPickerActivity::OnDraw() } //draw color square pointer - int currentHueX = int(restrict_flt(float(currentHue), 0, 359)); + int currentHueX = clamp_flt(float(currentHue), 0, 359); int currentSaturationY = ((255-currentSaturation)/2); g->xor_line(offsetX+currentHueX, offsetY+currentSaturationY-5, offsetX+currentHueX, offsetY+currentSaturationY-1); g->xor_line(offsetX+currentHueX, offsetY+currentSaturationY+1, offsetX+currentHueX, offsetY+currentSaturationY+5);