Easy UI: Add frame fix

jindrapetrik · Oct 20, 2024 · 3bbe38e · 3bbe38e
1 parent 8c8deda
commit 3bbe38e
Showing 1 changed file with 22 additions and 50 deletions.
diff --git a/src/com/jpexs/decompiler/flash/easygui/TimelineBodyPanel.java b/src/com/jpexs/decompiler/flash/easygui/TimelineBodyPanel.java
@@ -1019,8 +1019,8 @@ public void doOperation() {
                                     break;
                                 }
                             }
-                        }                                                        
-
+                        }                                     
+                       
                         int lastFrame = timelined.getFrameCount() - 1;
                         //Add removeTag to other layers
                         for (int d = 1; d <= timeline.maxDepth; d++) {
@@ -1061,17 +1061,14 @@ public void doOperation() {
                         ds = timeline.getDepthState(f, nd);
                         boolean empty = ds == null || ds.getCharacter() == null;
                         if (!empty || somethingAfter) {                                
-                            int moveFrameCount = nf - f;
-                            if (moveFrameCount == 0) {
-                                moveFrameCount = 1;
-                            }
-                            boolean frameAdded = false;
+                            int moveFrameCount = somethingAfter ? 1 : nf - f;
                             for (int mf = 0; mf < moveFrameCount; mf++) {
                                 int pos = timelined.indexOfTag(timeline.getFrame(f).showFrameTag);
                                 ReadOnlyTagList tags = timelined.getTags();
                                 List<Tag> lastFrameDepthTags = new ArrayList<>();
                                 int f2 = f + 1;
                                 boolean endsWithRemove = false;
+                                boolean removeOnly = true;
                                 for (int i = pos + 1; i < tags.size(); i++) {
                                     Tag t = tags.get(i);
                                     if (t instanceof PlaceObjectTypeTag) {
@@ -1100,7 +1097,7 @@ public void doOperation() {
                                             i++;
                                         }
 
-                                        boolean removeOnly = true;
+                                        removeOnly = true;
                                         for (Tag lt : lastFrameDepthTags) {
                                             if (!(lt instanceof RemoveTag)) {
                                                 removeOnly = false;
@@ -1117,57 +1114,32 @@ public void doOperation() {
                                             }
                                         }
 
-                                        //Add beyond current total frameCount
-                                        if (onLastFrame) {
-                                            if ((!removeOnly && !lastFrameDepthTags.isEmpty()) || !endsWithRemove) {
-                                                //Add removeTag to other layers
-                                                for (int d = 1; d <= timeline.maxDepth; d++) {
-                                                    if (d == nd) {
-                                                        continue;
-                                                    }
-                                                    ds = timeline.getDepthState(f2, d);
-                                                    if (ds != null && ds.getCharacter() != null) {
-                                                        RemoveTag rt = new RemoveObject2Tag(timelined.getSwf());
-                                                        rt.setTimelined(timelined);
-                                                        rt.setDepth(d);
-                                                        timelined.addTag(i, rt);
-                                                        i++;
-                                                    }
-                                                }
-
-                                                frameAdded = true;
-                                                ShowFrameTag sf = new ShowFrameTag(timelined.getSwf());
-                                                sf.setTimelined(timelined);
-                                                timelined.addTag(sf);
-                                                i++;
-                                                timelined.setFrameCount(timelined.getFrameCount() + 1);
-                                            }
-                                        }
                                         lastFrameDepthTags.clear();
                                         f2++;
                                     }
                                 }
-                            }
-                            /*if (!frameAdded && fframe == timelined.getFrameCount() - 1) {
-                                //Add removeTag to other layers
-                                for (int d = 1; d <= timeline.maxDepth; d++) {
-                                    if (d == nd) {
-                                        continue;
-                                    }
-                                    ds = timeline.getFrame(fframe).layers.get(d);
-                                    if (ds != null && ds.getCharacter() != null) {
-                                        RemoveTag rt = new RemoveObject2Tag(timelined.getSwf());
-                                        rt.setTimelined(timelined);
-                                        rt.setDepth(d);
-                                        timelined.addTag(rt);
+
+                                if ((!removeOnly && !lastFrameDepthTags.isEmpty()) || !endsWithRemove) {
+                                    //Add removeTag to other layers
+                                    for (int d = 1; d <= timeline.maxDepth; d++) {
+                                        if (d == nd) {
+                                            continue;
+                                        }
+                                        ds = timeline.getDepthState(f2 - 1, d);
+                                        if (ds != null && ds.getCharacter() != null) {
+                                            RemoveTag rt = new RemoveObject2Tag(timelined.getSwf());
+                                            rt.setTimelined(timelined);
+                                            rt.setDepth(d);
+                                            timelined.addTag(rt);
+                                        }
                                     }
-                                }
-                                for (int mf = 0; mf < moveFrameCount; mf++) {
+
                                     ShowFrameTag sf = new ShowFrameTag(timelined.getSwf());
                                     sf.setTimelined(timelined);
                                     timelined.addTag(sf);
+                                    timelined.setFrameCount(timelined.getFrameCount() + 1);
                                 }
-                            }*/
+                            }                            
                             break;
                         }
                     }