diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-04-03 07:31:51 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2009-04-03 07:31:51 +0000 |
| commit | 6534c6675a44784ba84eeeddc57fb4044fe0dce5 (patch) | |
| tree | 1c8a240644f3ef1b70569cd1a806c5e84577b526 | |
| parent | 37c833ba1f5d3e45fa760deabbc057ffb0802966 (diff) | |
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
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6741 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Help_View.H | 2 | ||||
| -rw-r--r-- | src/Fl_Help_View.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index 24f20d3c4..07235c5a9 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -123,9 +123,9 @@ struct Fl_Help_Font_Stack { } /** 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 diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx index 8c93205a8..591698b0f 100644 --- a/src/Fl_Help_View.cxx +++ b/src/Fl_Help_View.cxx @@ -731,7 +731,7 @@ Fl_Help_View::draw() 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) { |