Author: spitzak
Date: 2007-07-13 07:16:33 -0700 (Fri, 13 Jul 2007)
New Revision: 5927
Log:
Tickmarks in sliders were being drawn in a random color (though it
appeared to be correct all the time)


Modified:
   trunk/src/Slider.cxx

Modified: trunk/src/Slider.cxx
===================================================================
--- trunk/src/Slider.cxx        2007-07-13 14:02:14 UTC (rev 5926)
+++ trunk/src/Slider.cxx        2007-07-13 14:16:33 UTC (rev 5927)
@@ -275,7 +275,7 @@
     //if (derivative > num) {num *= 5; smallmod = powincr = nummod = 2;}
   }
 
-  Color textcolor = getcolor();
+  Color textcolor = this->textcolor();
   Color linecolor = lerp(getbgcolor(), textcolor, .66666f);
   setcolor(linecolor);
   setfont(textfont(), textsize());
@@ -424,9 +424,6 @@
         break;
       }
     }
-    Color b = color();
-    Color c = contrast(textcolor(), b);
-    if (flags&INACTIVE_R) c = inactive(c, b);
     draw_ticks(tr, (slider_size()+1)/2);
   }
 

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to