summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES2
-rw-r--r--src/Fl_Valuator.cxx11
2 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index c5033fb77..13e6ae741 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.7
+ - Fl_Valuator would not format text output with decimal
+ point when the step value was fractional, but above 1
- Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745)
- fl_filename_relative() didn't compare drive letters in
diff --git a/src/Fl_Valuator.cxx b/src/Fl_Valuator.cxx
index b3837f1a6..4e83bf5de 100644
--- a/src/Fl_Valuator.cxx
+++ b/src/Fl_Valuator.cxx
@@ -118,10 +118,13 @@ double Fl_Valuator::increment(double v, int n) {
int Fl_Valuator::format(char* buffer) {
double v = value();
// MRS: THIS IS A HACK - RECOMMEND ADDING BUFFER SIZE ARGUMENT
- if (!A) return snprintf(buffer, 128, "%g", v);
- int i, X;
- double ba = B / A;
- for (X = 1, i = 0; X < ba; X *= 10) i++;
+ if (!A || !B) return snprintf(buffer, 128, "%g", v);
+ int i;
+ double ab = A/B;
+ for (i=0; i<8; i++) {
+ if ((ab-floor(ab))<1e-9) break;
+ ab *= 10.0;
+ }
return sprintf(buffer, "%.*f", i, v);
}