From 9f5d6a0ecbf4c8beaed7028c13f52aad443cf394 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Sat, 27 Apr 2002 19:35:18 +0000
Subject: Fix rendering of Fl_Light_Button with the plastic scheme.

The "none" and "base" schemes map to no scheme (standard FLTK look-n-feel)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2119 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES                      |  2 ++
 src/Fl_Light_Button.cxx      | 12 +++++++++---
 src/Fl_get_system_colors.cxx |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a0ae2f0e7..516868495 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 CHANGES IN FLTK 1.1.0rc1
 
+	- Fixed rendering of Fl_Light_Button with the plastic
+	  scheme.
 	- Fixed a bug in the MacOS font enumeration code.
 	- Now show a "locked" icon next to static/private
 	  elements in FLUID, and "unlocked" icon next to
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx
index 8a9ad003f..f23f7614e 100644
--- a/src/Fl_Light_Button.cxx
+++ b/src/Fl_Light_Button.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.13 2002/04/11 10:46:19 easysw Exp $"
+// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.14 2002/04/27 19:35:18 easysw Exp $"
 //
 // Lighted button widget for the Fast Light Tool Kit (FLTK).
 //
@@ -92,7 +92,13 @@ void Fl_Light_Button::draw() {
     int ww = W/2+1;
     int xx = dx;
     if (w()<ww+2*xx) xx = (w()-ww)/2;
-    draw_box(FL_THIN_DOWN_BOX, x()+xx, y()+dy+1, ww, hh, col);
+    if (Fl::scheme()) {
+      col = active_r() ? selection_color() : fl_inactive(selection_color());
+      fl_color(value() ? col : fl_color_average(col, FL_BLACK, 0.5f));
+      fl_pie(x()+xx, y()+dy+1, ww, hh, 0, 360);
+    } else {
+      draw_box(FL_THIN_DOWN_BOX, x()+xx, y()+dy+1, ww, hh, col);
+    }
     dx = (ww + 2 * dx - W) / 2;
   }
   draw_label(x()+W+2*dx, y(), w()-W-2*dx, h());
@@ -116,5 +122,5 @@ Fl_Light_Button::Fl_Light_Button(int x, int y, int w, int h, const char* l)
 }
 
 //
-// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.13 2002/04/11 10:46:19 easysw Exp $".
+// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.14 2002/04/27 19:35:18 easysw Exp $".
 //
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 7a4176ddd..2ac699e3f 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.8 2002/04/13 22:17:46 easysw Exp $"
+// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.9 2002/04/27 19:35:18 easysw Exp $"
 //
 // System color support for the Fast Light Tool Kit (FLTK).
 //
@@ -223,7 +223,7 @@ int Fl::scheme(const char *s) {
   }
 
   if (s) {
-    if (!strcasecmp(s, "none") || !*s) s = 0;
+    if (!strcasecmp(s, "none") || !strcasecmp(s, "base") || !*s) s = 0;
     else s = strdup(s);
   }
   if (scheme_) free((void*)scheme_);
@@ -316,5 +316,5 @@ int Fl::reload_scheme() {
 
 
 //
-// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.8 2002/04/13 22:17:46 easysw Exp $".
+// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.9 2002/04/27 19:35:18 easysw Exp $".
 //
-- 
cgit v1.2.3