Author: matt
Date: 2011-09-27 19:44:56 -0700 (Tue, 27 Sep 2011)
New Revision: 9070
Log:
STR 2711: fitting Menu_Button label text into the part that does not have the
pulldown symbol. This does not fix clipping: if a label is too big, it's still
ugly (and too big)!
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-09-28 02:21:06 UTC (rev
9069)
+++ branches/branch-1.3/src/Fl_Menu_Button.cxx 2011-09-28 02:44:56 UTC (rev
9070)
@@ -25,13 +25,13 @@
void Fl_Menu_Button::draw() {
if (!box() || type()) return;
+ 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();
+ draw_label(x(), y(), X-x()+2, h());
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;
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
