LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-18 03:18:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved internal viewer timeline

Browse Source
This commit is contained in:
Jindra Petk
2013-09-10 22:33:03 +02:00
parent a7d26a9878
commit 11d0b583af
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
private SWF swf;
private HashMap<Integer, CharacterTag> characters;
private int frameRate;
private boolean loaded;
@Override
public void setBackground(Color bg) {
@@ -97,15 +98,18 @@ public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
if (timer != null) {
timer.cancel();
}
drawable = null;
loaded = true;
ImageIcon icon = new ImageIcon(data);
label.setIcon(icon);
}
public void setDrawable(final DrawableTag drawable, final SWF swf, final HashMap<Integer, CharacterTag> characters, int frameRate) {
pause();
pause();
this.drawable = drawable;
this.swf = swf;
this.characters = characters;
loaded = true;
if (drawable.getNumFrames() == 0) {
label.setIcon(null);
@@ -124,6 +128,8 @@ public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
if (timer != null) {
timer.cancel();
}
drawable = null;
loaded = true;
ImageIcon icon = new ImageIcon(image);
label.setIcon(icon);
}
@@ -133,7 +139,11 @@ public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
if (drawable == null) {
return 0;
}
return percent * drawable.getNumFrames() / 100;
int ret=(int)Math.ceil(percent * drawable.getNumFrames() / 100.0);
if(ret==0){
ret = 1;
}
return ret;
}
@Override
@@ -218,6 +228,6 @@ public class ImagePanel extends JPanel implements ActionListener, FlashDisplay {
@Override
public boolean isLoaded() {
return drawable != null;
return loaded;
}
}

4
trunk/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java
View File

@@ -81,7 +81,7 @@ public class PlayerControls extends JPanel implements ActionListener {
progress.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
int frame = e.getX() * display.getTotalFrames() / progress.getWidth();
int frame = 1+(int)Math.floor(e.getX() * display.getTotalFrames() / (double)progress.getWidth());
boolean p = paused;
display.gotoFrame(frame);
if (!p) {
@@ -132,7 +132,7 @@ public class PlayerControls extends JPanel implements ActionListener {
progress.setIndeterminate(true);
} else {
progress.setMaximum(totalFrames);
progress.setMinimum(0);
progress.setMinimum(1);
progress.setValue(currentFrame);
progress.setIndeterminate(false);
}