# HG changeset patch
# User Chris Cannam
# Date 1309783684 -3600
# Node ID 6fc4fafc5e6bf443cc02412fcaea2f2b1cbf190b
# Parent  3d7070aa959e0a5639d8f978f8b96f60a22408af
Further minor abbrev fix

diff -r 3d7070aa959e -r 6fc4fafc5e6b src/textabbrev.cpp
--- a/src/textabbrev.cpp	Mon Jul 04 13:31:39 2011 +0100
+++ b/src/textabbrev.cpp	Mon Jul 04 13:48:04 2011 +0100
@@ -117,7 +117,7 @@
 
         while (tw > maxWidth && truncateTo > 1) {
 
-            if (tw > maxWidth + acw * 10) {
+            if (tw > maxWidth + acw * (ellipsis.length() + 5)) {
                 float ratio = float(maxWidth) / float(tw);
                 truncateTo = int(truncateTo * ratio * 1.2) + 10;
                 if (truncateTo >= tl) truncateTo = tl - 1;
@@ -139,7 +139,7 @@
 
 //        std::cerr << "done, final tw = " << tw << std::endl;
         
-        maxWidth = tw;
+        maxWidth = std::max(maxWidth, tw);
         return text;
 
     } else {