LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 01:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clicking outside deselects object.

Browse Source 
Timeline time offset fix.
This commit is contained in:
Jindra Petřík
2024-10-06 16:31:17 +02:00
parent c43769410c
commit 2b0bd28950
3 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/jpexs/decompiler/flash/easygui/TimelinePanel.java
View File

@@ -63,6 +63,7 @@ public class TimelinePanel extends JPanel {
public void run() {
timeline = timelined.getTimeline();
depthPanel.setTimeline(timeline);
timePanel.setTimeline(timeline);
}
});
@@ -159,5 +160,6 @@ public class TimelinePanel extends JPanel {
this.timelined = timelined;
timelineBodyPanel.setTimeline(timelined.getTimeline());
depthPanel.setTimeline(timelined.getTimeline());
timePanel.setTimeline(timelined.getTimeline());
}
}

19
src/com/jpexs/decompiler/flash/easygui/TimelineTimePanel.java
View File

@@ -16,6 +16,9 @@
*/
package com.jpexs.decompiler.flash.easygui;
import static com.jpexs.decompiler.flash.easygui.TimelineDepthPanel.FONT_SIZE;
import static com.jpexs.decompiler.flash.easygui.TimelineDepthPanel.PADDING;
import com.jpexs.decompiler.flash.timeline.Timeline;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
@@ -44,8 +47,9 @@ public class TimelineTimePanel extends JPanel implements MouseListener {
private int scrollOffset = 0;
private int selectedFrame = -1;
private int leftPos = 0;
private final List<FrameSelectionListener> listeners = new ArrayList<>();
private final List<FrameSelectionListener> listeners = new ArrayList<>();
public TimelineTimePanel() {
Dimension dim = new Dimension(Integer.MAX_VALUE, TimelineBodyPanel.FRAME_HEIGHT);
@@ -54,6 +58,15 @@ public class TimelineTimePanel extends JPanel implements MouseListener {
addMouseListener(this);
}
public void setTimeline(Timeline timeline) {
int maxDepth = timeline == null ? 0 : timeline.getMaxDepth();
String maxDepthStr = Integer.toString(maxDepth);
setFont(getFont().deriveFont(FONT_SIZE));
int maxDepthW = getFontMetrics(getFont()).stringWidth(maxDepthStr);
leftPos = maxDepthW + 2 * PADDING;
}
public void addFrameSelectionListener(FrameSelectionListener l) {
listeners.add(l);
}
@@ -86,7 +99,7 @@ public class TimelineTimePanel extends JPanel implements MouseListener {
g.setColor(TimelineBodyPanel.getBackgroundColor());
g.fillRect(0, 0, getWidth(), getHeight());
g.setColor(borderColor);
int xofs = TimelineBodyPanel.FRAME_WIDTH - scrollOffset % TimelineBodyPanel.FRAME_WIDTH - 1;
int xofs = leftPos - TimelineBodyPanel.FRAME_WIDTH - scrollOffset % TimelineBodyPanel.FRAME_WIDTH;
for (int f = 0; f <= end_f; f++) {
g.drawLine(xofs + f * TimelineBodyPanel.FRAME_WIDTH + 1, TimelineBodyPanel.FRAME_HEIGHT - 1, xofs + f * TimelineBodyPanel.FRAME_WIDTH + 1, TimelineBodyPanel.FRAME_HEIGHT - lineLength);
}
@@ -103,7 +116,7 @@ public class TimelineTimePanel extends JPanel implements MouseListener {
if ((cur_f + 1) % 5 == 0 || cur_f == 0) {
String timeStr = Integer.toString(cur_f + 1);
int w = g.getFontMetrics().stringWidth(timeStr);
g.drawString(timeStr, xofs + (f - 1) * TimelineBodyPanel.FRAME_WIDTH + TimelineBodyPanel.FRAME_WIDTH / 2 - w / 2, TimelineBodyPanel.FRAME_HEIGHT - lineLength - lineTextSpace);
g.drawString(timeStr, xofs + (f - 1) * TimelineBodyPanel.FRAME_WIDTH + TimelineBodyPanel.FRAME_WIDTH / 2 - w / 2 + 1, TimelineBodyPanel.FRAME_HEIGHT - lineLength - lineTextSpace);
}
}
}

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

@@ -1148,10 +1148,20 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
freeTransformDepth(depthStateUnderCursor.depth);
firePlaceObjectSelected();
}
} else if (selectionMode) {
} else if ((altDown && !selectionMode) || selectionMode){
selectDepth(depthStateUnderCursor.depth);
firePlaceObjectSelected();
}
} else {
if (transformSelectionMode) {
if (mode == Cursor.DEFAULT_CURSOR) {
freeTransformDepth(-1);
firePlaceObjectSelected();
}
} else if ((altDown && !selectionMode) || selectionMode) {
selectDepth(-1);
firePlaceObjectSelected();
}
}
if (!selectionMode) {
return;