Author: manolo
Date: 2011-10-17 06:46:31 -0700 (Mon, 17 Oct 2011)
New Revision: 9133
Log:
Back to before r.9070 because this change produces badly drawn menu button
labels.
Modified:
branches/branch-1.3/src/Fl_Menu_Button.cxx
Modified: branches/branch-1.3/src/Fl_Menu_Button.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu_Button.cxx 2011-10-12 12:44:25 UTC (rev
9132)
+++ branches/branch-1.3/src/Fl_Menu_Button.cxx 2011-10-17 13:46:31 UTC (rev
9133)
@@ -25,13 +25,13 @@
void Fl_Menu_Button::draw() {
if (!box() || type()) return;
+ draw_box(pressed_menu_button_ == this ? fl_down(box()) : box(), color());
+ draw_label();
+ if (Fl::focus() == this) draw_focus();
+ // ** if (box() == FL_FLAT_BOX) return; // for XForms compatibility
int H = (labelsize()-3)&-2;
int X = x()+w()-H*2;
int Y = y()+(h()-H)/2;
- draw_box(pressed_menu_button_ == this ? fl_down(box()) : box(), color());
- draw_label(x(), y(), X-x()+2, h());
- if (Fl::focus() == this) draw_focus();
- // ** if (box() == FL_FLAT_BOX) return; // for XForms compatibility
fl_color(active_r() ? FL_DARK3 : fl_inactive(FL_DARK3));
fl_line(X+H/2, Y+H, X, Y, X+H, Y);
fl_color(active_r() ? FL_LIGHT3 : fl_inactive(FL_LIGHT3));
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
