mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed fl_measure which mistook a trailing '@@' for a symbol (STR #1406)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5377 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2006-08-29 07:49:22 +00:00
parent 3ae2d9cc7b
commit ba8bb3d8c2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.8
- Fixed fl_measure which mistook a trailing '@@'
for a symbol (STR #1406)
- Fixed GLUT behavior on window creation (STR #1403)
- Fixed OS X bug that would hide tooltips before
they were shown (STR #1392)

2
src/fl_draw.cxx
View File

@ -305,7 +305,7 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
symwidth[0] = h;
}
if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1)) {
if (str && (p = strrchr(str, '@')) != NULL && p > (str + 1) && p[-1]!='@') {
strlcpy(symbol[1], p, sizeof(symbol[1]));
symwidth[1] = h;
}