LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-23 12:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Honfika
2014-03-05 17:31:20 +01:00
parent 269982f864
commit 7599463212
38 changed files with 159 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
trunk/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
View File

@@ -40,7 +40,6 @@ import java.util.Map;
import java.util.Stack;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ExecutorService;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JColorChooser;
@@ -63,11 +62,11 @@ public final class ImagePanel extends JPanel implements ActionListener, FlashDis
private SWF swf;
private HashMap<Integer, CharacterTag> characters;
private boolean loaded;
@Override
public void setBackground(Color bg) {
if (label != null) {
label.setBackground(bg);
label.setBackground(bg);
}
super.setBackground(bg);
}
@@ -164,7 +163,7 @@ public final class ImagePanel extends JPanel implements ActionListener, FlashDis
setImage(img);
}
return;
}
}
play();
}
@@ -213,16 +212,16 @@ public final class ImagePanel extends JPanel implements ActionListener, FlashDis
drawFrame();
}
}
private static SerializableImage getFrame(SWF swf,int frame,DrawableTag drawable,Map<Integer,CharacterTag> characters){
private static SerializableImage getFrame(SWF swf, int frame, DrawableTag drawable, Map<Integer, CharacterTag> characters) {
String key = "drawable_" + frame + "_" + drawable.hashCode();
SerializableImage img = SWF.getFromCache(key);
if (img == null) {
if (drawable instanceof BoundedTag) {
BoundedTag bounded = (BoundedTag) drawable;
RECT rect = bounded.getRect(characters, new Stack<Integer>());
if(rect == null){ //??? Why?
rect = new RECT(0,0,1,1);
if (rect == null) { //??? Why?
rect = new RECT(0, 0, 1, 1);
}
SerializableImage image = new SerializableImage((int) (rect.getWidth() / SWF.unitDivisor) + 1,
(int) (rect.getHeight() / SWF.unitDivisor) + 1, SerializableImage.TYPE_INT_ARGB);
@@ -244,15 +243,15 @@ public final class ImagePanel extends JPanel implements ActionListener, FlashDis
}
return img;
}
private void drawFrame() {
if (drawable == null) {
return;
}
Matrix mat = new Matrix();
mat.translateX = swf.displayRect.Xmin;
mat.translateY = swf.displayRect.Ymin;
ImageIcon icon = new ImageIcon(getFrame(swf,frame,drawable,characters).getBufferedImage());
mat.translateY = swf.displayRect.Ymin;
ImageIcon icon = new ImageIcon(getFrame(swf, frame, drawable, characters).getBufferedImage());
label.setIcon(icon);
}