mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clamp input values of Fl_Color_Chooser (#749) 

Note: this may be somewhat confusing if the user enters out-of-range
values manually because they are overwritten immediately with valid
input but the effects seen in issue #749 are IMHO worse.
This commit is contained in:
Albrecht Schlosser 2023-07-13 14:34:25 +02:00
parent 03913f32e0
commit 580a531ef5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Fl_Color_Chooser.cxx
View File

@ -1,7 +1,7 @@
//
// Color chooser for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2019 by Bill Spitzak and others.
// Copyright 1998-2023 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -428,9 +428,14 @@ int Flcc_ValueBox::handle_key(int key) {
void Fl_Color_Chooser::rgb_cb(Fl_Widget* o, void*) {
Fl_Color_Chooser* c = (Fl_Color_Chooser*)(o->parent());
double R = c->rvalue.value();
double G = c->gvalue.value();
double B = c->bvalue.value();
// clamp input values to valid ranges (issue #749, part 1)
double R = c->rvalue.clamp(c->rvalue.value());
double G = c->gvalue.clamp(c->gvalue.value());
double B = c->bvalue.clamp(c->bvalue.value());
// update input values if they were clamped (#749, part 2)
c->rvalue.value(R);
c->gvalue.value(G);
c->bvalue.value(B);
if (c->mode() == M_HSV) {
if (c->hsv(R,G,B)) c->do_callback(FL_REASON_CHANGED);
return;