improved canvas text measurer

haxeui · Jun 7, 2023 · 7f79c72 · 7f79c72
1 parent 7ddb8ae
commit 7f79c72
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/haxe/ui/backend/html5/text/TextMeasurer.hx b/haxe/ui/backend/html5/text/TextMeasurer.hx
@@ -173,10 +173,7 @@ private class CanvasTextMeasurer extends DivTextMeasurer {
     }
 
     private function normalizeText(text:String):String {
-        if (text == "-") {
-            return text;
-        }
-        return text.replace("_", " ").replace("-", " ");
+        return text.replace("_", " ");
     }
 
     private static function computeLinesDefault(text:String, max:Float):Array<String> {
@@ -270,6 +267,11 @@ private class CanvasTextMeasurer extends DivTextMeasurer {
         if (line.length > 0) {
             lines.push(line);
         }
+        if (lines.length > 0) { 
+            if (_ctx.measureText(lines[lines.length - 1]).width > max) { 
+                lines.push(""); 
+            } 
+        }
 
         return lines;
     }