External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI battlefield layout fix

Browse source
This commit is contained in:
magenoxx 2012-05-21 00:18:31 +04:00
parent 011fbed0b2
commit 2312b38a75
2 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
View file

@ -34,23 +34,6 @@
package mage.client.game;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import javax.swing.JComponent;
import javax.swing.JScrollPane;
import mage.cards.MagePermanent;
import mage.client.cards.BigCard;
import mage.client.cards.Permanent;
@ -58,6 +41,14 @@ import mage.client.plugins.impl.Plugins;
import mage.client.util.Config;
import mage.view.PermanentView;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.*;
import java.util.List;
import java.util.Map.Entry;
/**
*
* @author BetaSteward_at_googlemail.com
@ -213,14 +204,16 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane {
final Component comp = c;
if (comp instanceof Permanent) {
if (((Permanent)comp).getPermanentId().equals(permanentId)) {
this.remove(comp);
}
comp.setVisible(false);
this.remove(comp);
}
} else if (comp instanceof MagePermanent) {
if (((MagePermanent)comp).getOriginal().getId().equals(permanentId)) {
Thread t = new Thread(new Runnable() {
@Override
public void run() {
Plugins.getInstance().onRemoveCard((MagePermanent)comp, count);
comp.setVisible(false);
BattlefieldPanel.this.remove(comp);
}
});

13
Mage.Client/src/main/java/org/mage/card/arcane/Animation.java
View file

@ -1,16 +1,12 @@
package org.mage.card.arcane;
import java.awt.Container;
import java.awt.EventQueue;
import java.awt.Point;
import mage.cards.MagePermanent;
import javax.swing.*;
import java.awt.*;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.JLayeredPane;
import javax.swing.SwingUtilities;
import mage.cards.MagePermanent;
abstract public class Animation {
static private final long TARGET_MILLIS_PER_FRAME = 30;
//static private final float HALF_PI = (float)(Math.PI / 2);
@ -363,6 +359,7 @@ abstract public class Animation {
}
protected void end () {
card.setAlpha(0f);
}
};
}