Author: manolo
Date: 2012-04-04 04:34:13 -0700 (Wed, 04 Apr 2012)
New Revision: 9317
Log:
Fix bug visible with pixmap demo where button label does not recover its color
when re-activated
Modified:
branches/branch-3.0/src/fltk3/labeltype.cxx
Modified: branches/branch-3.0/src/fltk3/labeltype.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/labeltype.cxx 2012-04-02 15:46:03 UTC (rev
9316)
+++ branches/branch-3.0/src/fltk3/labeltype.cxx 2012-04-04 11:34:13 UTC (rev
9317)
@@ -146,9 +146,11 @@
if (flags()&SHORTCUT_LABEL) fltk3::draw_shortcut = 1;
if (!active_r()) {
fltk3::Label l1(*this);
+ fltk3::Color c = l1.labelcolor();
l1.labelcolor( fltk3::inactive((fltk3::Color)l1.labelcolor()) );
if (l1.deimage()) l1.image(l1.deimage());
l1.draw(X,Y,W,H,a);
+ l1.labelcolor(c); // necessary because l1 and this share the same style
} else {
Label::draw(X,Y,W,H,a);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
