external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure animation card panels are disposed

Browse Source
This commit is contained in:
drdev
2014-01-05 08:08:46 +00:00
parent 8f4d3792c6
commit 9140dab9f1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gui/match/controllers/CHand.java
View File

@@ -142,8 +142,8 @@ public class CHand implements ICDoc {
endX = toPos.x; endX = toPos.x;
endY = toPos.y; endY = toPos.y;
final CardPanel animationPanel = new CardPanel(placeholder.getGameCard());
if (Singletons.getView().getFrame().isShowing()) { if (Singletons.getView().getFrame().isShowing()) {
final CardPanel animationPanel = new CardPanel(placeholder.getGameCard());
Animation.moveCard(startX, startY, startWidth, endX, endY, endWidth, animationPanel, placeholder, Animation.moveCard(startX, startY, startWidth, endX, endY, endWidth, animationPanel, placeholder,
layeredPane, 500); layeredPane, 500);
} }

1
forge-gui/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -225,7 +225,6 @@ public class CardPanel extends JPanel implements CardContainer, IDisposable {
} }
} }
/** /**
* <p> * <p>
* Setter for the field <code>displayEnabled</code>. * Setter for the field <code>displayEnabled</code>.

4
forge-gui/src/main/java/forge/view/arcane/util/Animation.java
View File

@@ -27,6 +27,7 @@ import java.util.TimerTask;
import javax.swing.JLayeredPane; import javax.swing.JLayeredPane;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import forge.gui.toolbox.FSkin;
import forge.view.arcane.CardPanel; import forge.view.arcane.CardPanel;
@@ -392,6 +393,9 @@ public abstract class Animation {
animationPanel.setVisible(false); animationPanel.setVisible(false);
animationPanel.repaint(); animationPanel.repaint();
layeredPane.remove(animationPanel); layeredPane.remove(animationPanel);
if (animationPanel != CardPanel.getDragAnimationPanel()) {
FSkin.dispose(animationPanel);
}
} }
}); });
} }