summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--src/Fl_Light_Button.cxx14
-rw-r--r--src/Fl_Menu.cxx14
3 files changed, 22 insertions, 12 deletions
diff --git a/CHANGES b/CHANGES
index 7903a8ee8..e52a6e2fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+CHANGES IN FLTK 1.1.0
+
+ - Tweeked the look of the check button with a patch from
+ Albrecht Schlosser.
+
+
CHANGES IN FLTK 1.1.0rc5
- Added "wrap" type bit to Fl_Input_, so you can now
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx
index a43f22ddc..9b3c9295a 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.17 2002/05/03 14:59:31 easysw Exp $"
+// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.18 2002/07/24 12:15:25 easysw Exp $"
//
// Lighted button widget for the Fast Light Tool Kit (FLTK).
//
@@ -57,10 +57,12 @@ void Fl_Light_Button::draw() {
draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR);
if (value()) {
fl_color(col);
- fl_line_style(FL_SOLID, 2);
- fl_line(x() + dx + W - 3, y() + dy + 3,
- x() + dx + W / 2 - 1, y() + dy + W - 4,
- x() + dx + 3, y() + dy + W / 2);
+ int xu = x() + dx + W/3 + 1;
+ int yu = y() + dy + W - 4;
+ fl_line_style(FL_SOLID, 1);
+ fl_line(xu - 2, yu - 2, xu, yu, xu + 5, yu - 5);
+ fl_line(xu - 2, yu - 3, xu, yu - 1, xu + 5, yu - 6);
+ fl_line(xu - 2, yu - 4, xu, yu - 2, xu + 5, yu - 7);
fl_line_style(FL_SOLID);
}
break;
@@ -142,5 +144,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.17 2002/05/03 14:59:31 easysw Exp $".
+// End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.18 2002/07/24 12:15:25 easysw Exp $".
//
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index 67bedd0e2..99ae01e25 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.14 2002/05/16 07:43:59 spitzak Exp $"
+// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.15 2002/07/24 12:15:25 easysw Exp $"
//
// Menu code for the Fast Light Tool Kit (FLTK).
//
@@ -199,10 +199,12 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
fl_draw_box(FL_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR);
if (value()) {
fl_color(labelcolor_);
- fl_line_style(FL_SOLID, 2);
- fl_line(x + W - 1, y + d + 3,
- x + W / 2 + 1, y + d + W - 4,
- x + 5, y + d + W / 2);
+ fl_line_style(FL_SOLID, 1);
+ int xu = x + W/3 + 3;
+ int yu = y + d + W - 4;
+ fl_line(xu - 2, yu - 2, xu, yu, xu + 5, yu - 5);
+ fl_line(xu - 2, yu - 3, xu, yu - 1, xu + 5, yu - 6);
+ fl_line(xu - 2, yu - 4, xu, yu - 2, xu + 5, yu - 7);
fl_line_style(FL_SOLID);
}
}
@@ -776,5 +778,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
}
//
-// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.14 2002/05/16 07:43:59 spitzak Exp $".
+// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.15 2002/07/24 12:15:25 easysw Exp $".
//