comparison src/textabbrev.cpp @ 464:6fc4fafc5e6b

Further minor abbrev fix

 
         int truncateTo = tl;
 
         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;
             } else {
                 truncateTo--;

             tl = text.length() - ellipsis.length();
         }
 
 //        std::cerr << "done, final tw = " << tw << std::endl;
         
-        maxWidth = tw;
+        maxWidth = std::max(maxWidth, tw);
         return text;
 
     } else {
         
         QStringList words = text.split(' ', QString::SkipEmptyParts);