From 5bdfdd92f6f2d4a1a80062bee92d78174fabfc5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= <jindra.petrik@gmail.com>
Date: Sun, 28 Jul 2013 08:30:21 +0200
Subject: [PATCH] Issue #257 Export FLA: DefineEditText color and size

---
 .../jpexs/decompiler/flash/xfl/XFLConverter.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index a8849d941..661d94053 100644
--- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -2322,7 +2322,7 @@ public class XFLConverter {
                     ret += "<characters>" + xmlString(rec.getText(tags, font)) + "</characters>";
                     ret += "<textAttrs>";
 
-                    ret += "<DOMTextAttrs aliasText=\"false\" rotation=\"true\" size=\"" + twipToPixel(textHeight) + "\" bitmapSize=\"1040\"";
+                    ret += "<DOMTextAttrs aliasText=\"false\" rotation=\"true\" size=\"" + twipToPixel(textHeight) + "\" bitmapSize=\"" + textHeight + "\"";
                     //indent=\"5\" leftMargin=\"2\" letterSpacing=\"1\" lineSpacing=\"6\" rightMargin=\"3\"
                     if (textColor != null) {
                         ret += " fillColor=\"" + textColor.toHexRGB() + "\"";
@@ -2424,6 +2424,10 @@ public class XFLConverter {
                     boolean bold = false;
                     String fontFace = null;
                     int size = -1;
+                    RGBA textColor = null;
+                    if (det.hasTextColor) {
+                        textColor = det.textColor;
+                    }
                     if (det.hasFont) {
                         String fontName = null;
                         FontTag ft = null;
@@ -2479,12 +2483,15 @@ public class XFLConverter {
                         ret += " rightMargin=\"" + twipToPixel(rightMargin) + "\"";
                     }
                     if (size > -1) {
-                        ret += " size=\"" + size + "\"";
-                        ret += " bitmapSize=\"" + (size * 20) + "\"";
+                        ret += " size=\"" + twipToPixel(size) + "\"";
+                        ret += " bitmapSize=\"" + size + "\"";
                     }
                     if (fontFace != null) {
                         ret += " face=\"" + fontFace + "\"";
                     }
+                    if (textColor != null) {
+                        ret += " fillColor=\"" + textColor.toHexRGB() + "\" alpha=\"" + textColor.getAlphaFloat() + "\"";
+                    }
                     ret += "/>";
                     ret += "</textAttrs>";
                     ret += "</DOMTextRun>";