summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2006-12-21 19:39:26 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2006-12-21 19:39:26 +0000
commit1c47b9826d72b427d08ebc4f07cead801067708b (patch)
treec4996b34f7b4905969b480854e9ca856b61451a2 /src
parentbaed853fe369f6ef46e7c583d0347e8b42160d65 (diff)
Fix fl_measure with symbols.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5565 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/fl_draw.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 64aabb690..216ec072a 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -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;
}