Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-27 10:57:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Radio button drawing fixes from Albrecht Schlosser.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2129 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-04-29 19:27:51 +00:00
parent 6bfe3e970a
commit b5a79264a1
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CREDITS
+1
View File
@@ -37,5 +37,6 @@ OTHER CONTRIBUTORS
Alexander Mai Alexander Mai
Alexander Rabi Alexander Rabi
James Roth James Roth
Albrecht Schlosser
Andrea Suatoni Andrea Suatoni
Paul Sydney Paul Sydney
README
+1 -1
View File
@@ -170,7 +170,7 @@ MESA
TRADEMARKS TRADEMARKS
Microsoft and Windows are registered trademarks of Microsoft Microsoft and Windows are registered trademarks of Microsoft
Corportation. UNIX is a registered trademark of the X/Open Corporation. UNIX is a registered trademark of the X/Open
Group, Inc. OpenGL is a registered trademark of Silicon Group, Inc. OpenGL is a registered trademark of Silicon
Graphics, Inc. MacOS is a registered trademark of Apple Graphics, Inc. MacOS is a registered trademark of Apple
Computers, Inc. Computers, Inc.
src/Fl_Light_Button.cxx
+5 -4
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.14 2002/04/27 19:35:18 easysw Exp $" // "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.15 2002/04/29 19:27:51 easysw Exp $"
// //
// Lighted button widget for the Fast Light Tool Kit (FLTK). // Lighted button widget for the Fast Light Tool Kit (FLTK).
// //
@@ -44,6 +44,7 @@ void Fl_Light_Button::draw() {
W = labelsize(); W = labelsize();
dx = Fl::box_dx(box()) + 2; dx = Fl::box_dx(box()) + 2;
dy = (h() - W) / 2; dy = (h() - W) / 2;
if (dy < 0) dy = 0; // no negative values (?)
if (down_box()) { if (down_box()) {
// draw other down_box() styles: // draw other down_box() styles:
@@ -66,7 +67,7 @@ void Fl_Light_Button::draw() {
case _FL_ROUND_DOWN_BOX : case _FL_ROUND_DOWN_BOX :
case _FL_ROUND_UP_BOX : case _FL_ROUND_UP_BOX :
// Radio button... // Radio button...
draw_box(down_box(), x()+dx, y()+dy+1, W, W, FL_BACKGROUND2_COLOR); draw_box(down_box(), x()+dx, y()+dy, W, W, FL_BACKGROUND2_COLOR);
if (value()) { if (value()) {
fl_color(col); fl_color(col);
int tW = W - Fl::box_dw(down_box()) - 3; int tW = W - Fl::box_dw(down_box()) - 3;
@@ -74,7 +75,7 @@ void Fl_Light_Button::draw() {
int tdy = dy + Fl::box_dy(down_box()) + 1; int tdy = dy + Fl::box_dy(down_box()) + 1;
if (tW > 4) { if (tW > 4) {
fl_pie(x() + tdx, y() + tdy, tW, tW + 1, 0.0, 360.0); fl_pie(x() + tdx, y() + tdy, tW, tW , 0.0, 360.0);
} else { } else {
// Small circles don't draw well with some X servers... // Small circles don't draw well with some X servers...
fl_rectf(x() + tdx + 1, y() + tdy, 2, 4); fl_rectf(x() + tdx + 1, y() + tdy, 2, 4);
@@ -122,5 +123,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.14 2002/04/27 19:35:18 easysw Exp $". // End of "$Id: Fl_Light_Button.cxx,v 1.4.2.3.2.15 2002/04/29 19:27:51 easysw Exp $".
// //
src/Fl_Menu.cxx
+7 -7
View File
@@ -1,5 +1,5 @@
// //
// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.9 2002/04/11 10:46:19 easysw Exp $" // "$Id: Fl_Menu.cxx,v 1.18.2.12.2.10 2002/04/29 19:27:51 easysw Exp $"
// //
// Menu code for the Fast Light Tool Kit (FLTK). // Menu code for the Fast Light Tool Kit (FLTK).
// //
@@ -163,17 +163,17 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
int W = h - 2 * d; int W = h - 2 * d;
if (flags & FL_MENU_RADIO) { if (flags & FL_MENU_RADIO) {
fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d+1, W, W, FL_BACKGROUND2_COLOR); fl_draw_box(FL_ROUND_DOWN_BOX, x+2, y+d, W, W, FL_BACKGROUND2_COLOR);
if (value()) { if (value()) {
fl_color(labelcolor_); fl_color(labelcolor_);
int tW = W - Fl::box_dw(FL_ROUND_DOWN_BOX) - 3; int tW = W - Fl::box_dw(FL_ROUND_DOWN_BOX) - 3;
int td = Fl::box_dx(FL_ROUND_DOWN_BOX) + 2; int td = Fl::box_dx(FL_ROUND_DOWN_BOX) + 1;
if (tW > 4) { if (tW > 4) {
fl_pie(x + td + 1, y + td, tW, tW + 1, 0.0, 360.0); fl_pie(x+2 + td , y + d + td, tW, tW , 0.0, 360.0);
} else { } else {
// Small circles don't draw well with some X servers... // Small circles don't draw well with some X servers...
fl_rectf(x + td + 2, y + td, 2, 4); fl_rectf(x + td + 3, y + d + td, 2, 4);
fl_rectf(x + td + 1, y + td + 1, 4, 2); fl_rectf(x + td + 2, y + d + td + 1, 4, 2);
} }
} }
} else { } else {
@@ -756,5 +756,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
} }
// //
// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.9 2002/04/11 10:46:19 easysw Exp $". // End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.10 2002/04/29 19:27:51 easysw Exp $".
// //