From b47973f560662b0fd750e24df31ddb34b666a0d5 Mon Sep 17 00:00:00 2001
From: Bill Spitzak <spitzak@gmail.com>
Date: Wed, 3 Mar 1999 07:21:28 +0000
Subject: Patch from Dr. Tom Holroyd for fill sliders, seems good to me!

git-svn-id: file:///fltk/svn/fltk/trunk@350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Slider.cxx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Slider.cxx b/src/Fl_Slider.cxx
index d5241efcf..cc28e32b7 100644
--- a/src/Fl_Slider.cxx
+++ b/src/Fl_Slider.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Slider.cxx,v 1.7 1999/01/07 19:17:27 mike Exp $"
+// "$Id: Fl_Slider.cxx,v 1.8 1999/03/03 07:21:28 bill Exp $"
 //
 // Slider widget for the Fast Light Tool Kit (FLTK).
 //
@@ -109,7 +109,7 @@ void Fl_Slider::draw(int x, int y, int w, int h) {
   int X, S;
   if (type()==FL_HOR_FILL_SLIDER || type() == FL_VERT_FILL_SLIDER) {
     S = int(val*W+.5);
-    if (minimum()>maximum()) {S = W-S; X = h-BW-S;}
+    if (minimum()>maximum()) {S = W-S; X = W-S+BW;}
     else X = BW;
   } else {
     S = int(slider_size_*W+.5);
@@ -182,7 +182,9 @@ int Fl_Slider::handle(int event, int x, int y, int w, int h) {
     int S = int(slider_size_*W+.5);
     int T = (horizontal() ? h : w)/2-BW+1;
     if (type()==FL_VERT_NICE_SLIDER || type()==FL_HOR_NICE_SLIDER) T += 4;
-    if (S < T) S = T;
+    if (type()!=FL_HOR_FILL_SLIDER && type()!=FL_VERT_FILL_SLIDER) {
+      if (S < T) S = T;
+    }
     double v = double(X)/(W-S);
     double sliderwidth = double(S)/(W-S);
     double val = (value()-minimum())/(maximum()-minimum());
@@ -228,5 +230,5 @@ int Fl_Slider::handle(int event) {
 }
 
 //
-// End of "$Id: Fl_Slider.cxx,v 1.7 1999/01/07 19:17:27 mike Exp $".
+// End of "$Id: Fl_Slider.cxx,v 1.8 1999/03/03 07:21:28 bill Exp $".
 //
-- 
cgit v1.2.3