Issue #229, #209 FLA export text positions

variable deobfuscation fix
This commit is contained in:
Jindra Pet��k
2013-07-13 16:02:27 +02:00
parent cc3e70f6ae
commit 976e5c5cc7
5 changed files with 21 additions and 2 deletions
@@ -73,9 +73,11 @@ public class GetVariableTreeItem extends TreeItem {
public void setComputedValue(GraphTargetItem computedValue) {
this.computedValue = computedValue;
if (computedValue != null) {
computedResult = computedValue.getResult();
if (computedValue != null) {
computedCompiletime = computedValue.isCompileTime();
if(computedCompiletime){
computedResult = computedValue.getResult();
}
computedVariableComputed = computedValue.isVariableComputed();
}
}
@@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.tags.base.TextTag;
import com.jpexs.decompiler.flash.tags.text.ParseException;
import com.jpexs.decompiler.flash.tags.text.ParsedSymbol;
import com.jpexs.decompiler.flash.tags.text.TextLexer;
import com.jpexs.decompiler.flash.types.MATRIX;
import com.jpexs.decompiler.flash.types.RECT;
import com.jpexs.decompiler.flash.types.RGBA;
import java.awt.geom.GeneralPath;
@@ -85,6 +86,11 @@ public class DefineEditTextTag extends CharacterTag implements BoundedTag, TextT
public RECT getBounds() {
return bounds;
}
@Override
public MATRIX getTextMatrix(){
return new MATRIX();
}
@Override
public void setBounds(RECT r) {
@@ -76,6 +76,11 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag,
public RECT getBounds() {
return textBounds;
}
@Override
public MATRIX getTextMatrix(){
return textMatrix;
}
@Override
public void setBounds(RECT r) {
@@ -72,6 +72,10 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag,
public List<TEXTRECORD> textRecords;
public static final int ID = 11;
@Override
public MATRIX getTextMatrix(){
return textMatrix;
}
@Override
public RECT getBounds() {
return textBounds;
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.tags.base;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.tags.text.ParseException;
import com.jpexs.decompiler.flash.types.MATRIX;
import com.jpexs.decompiler.flash.types.RECT;
import java.util.List;
@@ -27,6 +28,7 @@ import java.util.List;
*/
public interface TextTag {
public MATRIX getTextMatrix();
public String getText(List<Tag> tags);
public String getFormattedText(List<Tag> tags);