|
|
@ -378,8 +378,7 @@ int Fl_Browser::item_height(void *item) const { |
|
|
|
Fl_Font font = textfont(); // default font
|
|
|
|
Fl_Font font = textfont(); // default font
|
|
|
|
int tsize = textsize(); // default size
|
|
|
|
int tsize = textsize(); // default size
|
|
|
|
if ( format_char() ) { // can be NULL
|
|
|
|
if ( format_char() ) { // can be NULL
|
|
|
|
while (*str==format_char()) { |
|
|
|
while (*str==format_char() && *str++ && *str!=format_char()) { |
|
|
|
str++; |
|
|
|
|
|
|
|
switch (*str++) { |
|
|
|
switch (*str++) { |
|
|
|
case 'l': case 'L': tsize = 24; break; |
|
|
|
case 'l': case 'L': tsize = 24; break; |
|
|
|
case 'm': case 'M': tsize = 18; 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 'C': while (isdigit(*str & 255)) str++; break; // skip a color number
|
|
|
|
case 'F': font = (Fl_Font)strtol(str,&str,10); break; |
|
|
|
case 'F': font = (Fl_Font)strtol(str,&str,10); break; |
|
|
|
case 'S': tsize = strtol(str,&str,10); break; |
|
|
|
case 'S': tsize = strtol(str,&str,10); break; |
|
|
|
case 0: case '@': str--; |
|
|
|
|
|
|
|
case '.': goto END_FORMAT; |
|
|
|
case '.': goto END_FORMAT; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -458,9 +456,6 @@ int Fl_Browser::item_width(void *item) const { |
|
|
|
case '.': |
|
|
|
case '.': |
|
|
|
done = 1; |
|
|
|
done = 1; |
|
|
|
break; |
|
|
|
break; |
|
|
|
case '@': |
|
|
|
|
|
|
|
str--; |
|
|
|
|
|
|
|
done = 1; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (done) |
|
|
|
if (done) |
|
|
@ -578,8 +573,6 @@ void Fl_Browser::item_draw(void* item, int X, int Y, int W, int H) const { |
|
|
|
break; |
|
|
|
break; |
|
|
|
case '.': |
|
|
|
case '.': |
|
|
|
goto BREAK; |
|
|
|
goto BREAK; |
|
|
|
case '@': |
|
|
|
|
|
|
|
str--; goto BREAK; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|