Author: AlbrechtS
Date: 2009-04-03 00:31:51 -0700 (Fri, 03 Apr 2009)
New Revision: 6741
Log:
STR #2184: bug in Fl_Help_Viewer font stack
src/Fl_Help_View.cxx:
removed double pushfont() for color changes
FL/Fl_Help_View.H:
fixed Fl_Help_Font_Stack::pop() to set the correct font
Modified:
branches/branch-1.3/FL/Fl_Help_View.H
branches/branch-1.3/src/Fl_Help_View.cxx
Modified: branches/branch-1.3/FL/Fl_Help_View.H
===================================================================
--- branches/branch-1.3/FL/Fl_Help_View.H 2009-04-02 22:02:19 UTC (rev
6740)
+++ branches/branch-1.3/FL/Fl_Help_View.H 2009-04-03 07:31:51 UTC (rev
6741)
@@ -123,9 +123,9 @@
}
/** Pops from the stack the font style triplet and calls fl_font() &
fl_color() adequately */
void pop(Fl_Font &f, Fl_Fontsize &s, Fl_Color &c) {
+ if (nfonts_ > 0) nfonts_ --;
top(f, s, c);
fl_font(f, s); fl_color(c);
- if (nfonts_ > 0) nfonts_ --;
}
/** Gets the current count of font style elts in the stack */
size_t count() const {return nfonts_;} /// Gets the current number of fonts
in the stack
Modified: branches/branch-1.3/src/Fl_Help_View.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Help_View.cxx 2009-04-02 22:02:19 UTC (rev
6740)
+++ branches/branch-1.3/src/Fl_Help_View.cxx 2009-04-03 07:31:51 UTC (rev
6741)
@@ -731,7 +731,7 @@
else if (strcasecmp(buf, "FONT") == 0)
{
if (get_attr(attrs, "COLOR", attr, sizeof(attr)) != NULL) {
- pushfont(font, fsize, (textcolor_ = get_color(attr, textcolor_))
);
+ textcolor_ = get_color(attr, textcolor_);
}
if (get_attr(attrs, "FACE", attr, sizeof(attr)) != NULL) {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
