From 1c47b9826d72b427d08ebc4f07cead801067708b Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 21 Dec 2006 19:39:26 +0000 Subject: Fix fl_measure with symbols. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5565 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_draw.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3