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

Dispose CardPanels as they are removed from CardPanelContainer

Browse Source
This commit is contained in:
drdev
2014-01-05 08:00:30 +00:00
parent 9d73236812
commit 8f4d3792c6
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui/src/main/java/forge/view/arcane/CardPanelContainer.java
View File

@@ -35,6 +35,7 @@ import forge.Constant;
import forge.FThreads; import forge.FThreads;
import forge.game.card.Card; import forge.game.card.Card;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.gui.toolbox.FSkin;
import forge.gui.toolbox.special.CardZoomer; import forge.gui.toolbox.special.CardZoomer;
import forge.view.arcane.util.CardPanelMouseListener; import forge.view.arcane.util.CardPanelMouseListener;
@@ -340,6 +341,7 @@ public abstract class CardPanelContainer extends JPanel {
CardPanelContainer.this.setMouseDragPanel(null); CardPanelContainer.this.setMouseDragPanel(null);
} }
CardPanelContainer.this.hoveredPanel = null; CardPanelContainer.this.hoveredPanel = null;
FSkin.dispose(fromPanel);
CardPanelContainer.this.getCardPanels().remove(fromPanel); CardPanelContainer.this.getCardPanels().remove(fromPanel);
CardPanelContainer.this.remove(fromPanel); CardPanelContainer.this.remove(fromPanel);
CardPanelContainer.this.invalidate(); CardPanelContainer.this.invalidate();
@@ -359,6 +361,11 @@ public abstract class CardPanelContainer extends JPanel {
return; return;
} }
for (CardPanel p : this.getCardPanels()) {
if (!cardPanels.contains(p)) { //dispose of any card panels that have been removed
FSkin.dispose(p);
}
}
this.getCardPanels().clear(); this.getCardPanels().clear();
this.removeAll(); this.removeAll();
this.getCardPanels().addAll(cardPanels); this.getCardPanels().addAll(cardPanels);
@@ -378,6 +385,9 @@ public abstract class CardPanelContainer extends JPanel {
*/ */
public final void clear() { public final void clear() {
FThreads.assertExecutedByEdt(true); FThreads.assertExecutedByEdt(true);
for (CardPanel p : CardPanelContainer.this.getCardPanels()) {
FSkin.dispose(p);
}
CardPanelContainer.this.getCardPanels().clear(); CardPanelContainer.this.getCardPanels().clear();
CardPanelContainer.this.removeAll(); CardPanelContainer.this.removeAll();
CardPanelContainer.this.setPreferredSize(new Dimension(0, 0)); CardPanelContainer.this.setPreferredSize(new Dimension(0, 0));