diff options
| author | Matthias Melcher <github@matthiasm.com> | 2018-12-28 17:25:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 17:25:28 -0800 |
| commit | bf9dfa2afdaa7a20d1152151519d3e34a1758a92 (patch) | |
| tree | 8e7da81c8be479870979fc76ef29e92b50c8119d /src | |
| parent | 6097bde83cfbaadf2247ae25c9272ee4a821fb35 (diff) | |
| parent | bf48acdbe53bd9fdebaa731831cea946f394350d (diff) | |
Merge pull request #11 from MatthiasWM/master
Fixing STR #2901, Fl_Browser formatting char
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Browser.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx index 196796b97..72aa8de37 100644 --- a/src/Fl_Browser.cxx +++ b/src/Fl_Browser.cxx @@ -378,8 +378,7 @@ int Fl_Browser::item_height(void *item) const { Fl_Font font = textfont(); // default font int tsize = textsize(); // default size if ( format_char() ) { // can be NULL - while (*str==format_char()) { - str++; + while (*str==format_char() && *str++ && *str!=format_char()) { switch (*str++) { case 'l': case 'L': tsize = 24; break; case 'm': case 'M': tsize = 18; break; @@ -391,7 +390,6 @@ int Fl_Browser::item_height(void *item) const { case 'C': while (isdigit(*str & 255)) str++; break; // skip a color number case 'F': font = (Fl_Font)strtol(str,&str,10); break; case 'S': tsize = strtol(str,&str,10); break; - case 0: case '@': str--; case '.': goto END_FORMAT; } } @@ -458,9 +456,6 @@ int Fl_Browser::item_width(void *item) const { case '.': done = 1; break; - case '@': - str--; - done = 1; } if (done) @@ -578,8 +573,6 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const { break; case '.': goto BREAK; - case '@': - str--; goto BREAK; } } } |