diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-11-19 08:44:43 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-11-19 08:44:43 +0000 |
| commit | c05eed1e54567142f2d5558e5901301041597152 (patch) | |
| tree | e5de3ab0a136e40b0392ca25ab3ba277677b36d8 /src | |
| parent | 555f3eb3a75ebbc397178d843aed8a1317b97af6 (diff) | |
Correctly measures browser items with @C or @B color formatting commands.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@891 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Browser.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx index 4f734275f..d360fd854 100644 --- a/src/Fl_Browser.cxx +++ b/src/Fl_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser.cxx,v 1.9.2.6 1999/05/11 09:39:29 bill Exp $" +// "$Id: Fl_Browser.cxx,v 1.9.2.7 1999/11/19 08:44:43 bill Exp $" // // Browser widget for the Fast Light Tool Kit (FLTK). // @@ -229,8 +229,10 @@ int Fl_Browser::item_height(void* lv) const { case 'b': font = (Fl_Font)(font|FL_BOLD); break; case 'i': font = (Fl_Font)(font|FL_ITALIC); break; case 'f': case 't': font = FL_COURIER; break; - case 'S': size = strtol(str,&str,10); break; + case 'B': + case 'C': strtol(str, &str, 10); break;// skip a color number case 'F': font = (Fl_Font)strtol(str,&str,10); break; + case 'S': size = strtol(str,&str,10); break; case 0: case '@': str--; case '.': goto END_FORMAT; } @@ -277,9 +279,10 @@ int Fl_Browser::item_width(void* v) const { case 'b': font = (Fl_Font)(font|FL_BOLD); break; case 'i': font = (Fl_Font)(font|FL_ITALIC); break; case 'f': case 't': font = FL_COURIER; break; - case 'S': - size = strtol(str, &str, 10); - break; + case 'B': + case 'C': strtol(str, &str, 10); break;// skip a color number + case 'F': font = (Fl_Font)strtol(str, &str, 10); break; + case 'S': size = strtol(str, &str, 10); break; case '.': done = 1; case '@': @@ -488,5 +491,5 @@ int Fl_Browser::value() const { } // -// End of "$Id: Fl_Browser.cxx,v 1.9.2.6 1999/05/11 09:39:29 bill Exp $". +// End of "$Id: Fl_Browser.cxx,v 1.9.2.7 1999/11/19 08:44:43 bill Exp $". // |