Fix fl_measure with symbols.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5565 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
baed853fe3
commit
1c47b9826d
@ -301,12 +301,12 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
|
||||
*symptr++ = *str++);
|
||||
*symptr = '\0';
|
||||
if (isspace(*str)) str++;
|
||||
symwidth[0] = min(w,h);
|
||||
symwidth[0] = h;
|
||||
}
|
||||
|
||||
if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1]!='@') {
|
||||
strlcpy(symbol[1], p, sizeof(symbol[1]));
|
||||
symwidth[1] = min(w,h);
|
||||
symwidth[1] = h;
|
||||
}
|
||||
}
|
||||
|
||||
@ -326,7 +326,7 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
|
||||
}
|
||||
|
||||
symtotal = symwidth[0] + symwidth[1];
|
||||
|
||||
|
||||
w = W + symtotal;
|
||||
h = lines*h;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user