flash fixes... flash?!?!

haxeui · Feb 13, 2024 · d7ceaa1 · d7ceaa1
1 parent ee90746
commit d7ceaa1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/haxe/ui/backend/TextDisplayImpl.hx b/haxe/ui/backend/TextDisplayImpl.hx
@@ -36,6 +36,14 @@ class TextDisplayImpl extends TextBase {
         tf.selectable = false;
         tf.mouseEnabled = false;
         tf.autoSize = TextFieldAutoSize.LEFT;
+
+        #if flash
+        var format:TextFormat = tf.getTextFormat();
+        format.font = "_sans";
+        format.size = 13;
+        tf.defaultTextFormat = format;
+        #end
+
         #if cache_text_metrics
         var format:TextFormat = tf.getTextFormat();
         format.font = "_sans";
@@ -107,7 +115,9 @@ class TextDisplayImpl extends TextBase {
         }
 
         textField.defaultTextFormat = format;
-        //textField.setTextFormat(format);
+        #if flash
+        textField.setTextFormat(format);
+        #end
         if (textField.wordWrap != _displayData.wordWrap) {
             textField.wordWrap = _displayData.wordWrap;
             measureTextRequired = true;
@@ -185,17 +195,19 @@ class TextDisplayImpl extends TextBase {
         #else
         _textWidth = textField.textWidth - 2;
         #end
+
         _textHeight = textField.textHeight;
         if (_textHeight == 0) {
             var tmpText:String = textField.text;
             textField.text = "|";
             _textHeight = textField.textHeight;
             textField.text = tmpText;
         }
+
         #if !flash
         //_textHeight += PADDING_Y;
         #else
-        _textHeight += 2;
+        //_textHeight += 2;
         #end
 
         _textWidth = Math.round(_textWidth);

diff --git a/haxe/ui/backend/TextInputImpl.hx b/haxe/ui/backend/TextInputImpl.hx
@@ -6,6 +6,7 @@ import openfl.events.Event;
 import openfl.text.TextField;
 import openfl.text.TextFieldAutoSize;
 import openfl.text.TextFieldType;
+import openfl.text.TextFormat;
 
 class TextInputImpl extends TextDisplayImpl {
     public function new() {
@@ -28,6 +29,13 @@ class TextInputImpl extends TextDisplayImpl {
         tf.multiline = true;
         tf.wordWrap = true;
 
+        #if flash
+        var format:TextFormat = tf.getTextFormat();
+        format.font = "_sans";
+        format.size = 13;
+        tf.defaultTextFormat = format;
+        #end
+
         return tf;
     }
 
@@ -158,6 +166,10 @@ class TextInputImpl extends TextDisplayImpl {
         #end
         super.measureText();
 
+        #if flash
+        _textHeight += 2;
+        #end
+
         #if openfl_textfield_workarounds // not required for alot of apps, or later versions of openfl
         if (StringTools.endsWith(_text, "\n")) {
             _textHeight += textField.getLineMetrics(textField.numLines - 2).height;