External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

should be more smooth now.

Browse source
This commit is contained in:
magenoxx 2010-11-06 22:42:44 +00:00
parent c9296c49a5
commit beb37db93a
3 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -131,6 +131,7 @@ public class MageFrame extends javax.swing.JFrame {
disableButtons(); disableButtons();
//TODO: //TODO:
if (Plugins.getInstance().isCardPluginLoaded()) {
Separator separator = new javax.swing.JToolBar.Separator(); Separator separator = new javax.swing.JToolBar.Separator();
mageToolbar.add(separator); mageToolbar.add(separator);
@ -146,6 +147,7 @@ public class MageFrame extends javax.swing.JFrame {
}); });
mageToolbar.add(btnDownload); mageToolbar.add(btnDownload);
} }
}
private void btnImagesActionPerformed(java.awt.event.ActionEvent evt) { private void btnImagesActionPerformed(java.awt.event.ActionEvent evt) {
Set<Card> allCards = new LinkedHashSet<Card>(); Set<Card> allCards = new LinkedHashSet<Card>();

6
Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -11,7 +11,6 @@ import java.awt.Point;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -111,7 +110,7 @@ public class CardPanel extends MagePermanent {
overlayPanel.setScalingMultiPassType(MultipassType.none); overlayPanel.setScalingMultiPassType(MultipassType.none);
//TODO: Image sickness = ImageManager.getSicknessImage(); //TODO: Image sickness = ImageManager.getSicknessImage();
Image sickness = null; BufferedImage sickness = null;
overlayPanel.setImage(sickness, sickness); overlayPanel.setImage(sickness, sickness);
imagePanel = new ScaledImagePanel(); imagePanel = new ScaledImagePanel();
@ -129,6 +128,7 @@ public class CardPanel extends MagePermanent {
try { try {
tappedAngle = gameCard.isTapped() ? CardPanel.TAPPED_ANGLE : 0; tappedAngle = gameCard.isTapped() ? CardPanel.TAPPED_ANGLE : 0;
BufferedImage srcImage = ImageCache.getImageOriginal(gameCard); BufferedImage srcImage = ImageCache.getImageOriginal(gameCard);
srcImage = ImageCache.getNormalSizeImage(srcImage);
if (srcImage != null) { if (srcImage != null) {
hasImage = true; hasImage = true;
setText(gameCard); setText(gameCard);
@ -510,7 +510,7 @@ public class CardPanel extends MagePermanent {
@Override @Override
public Image getImage() { public Image getImage() {
return this.imagePanel.getSrcImage(); return ImageCache.getImageOriginal(gameCard);
} }
} }

11
Mage.Plugins/Mage.Card.Plugin/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -12,6 +12,7 @@ import javax.imageio.ImageIO;
import mage.view.CardView; import mage.view.CardView;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.mage.plugins.card.constants.Constants;
import org.mage.plugins.card.utils.CardImageUtils; import org.mage.plugins.card.utils.CardImageUtils;
import com.google.common.base.Function; import com.google.common.base.Function;
@ -142,12 +143,12 @@ public class ImageCache {
/** /**
* Returns an image scaled to the size given * Returns an image scaled to the size given
*/ */
/*private static BufferedImage getNormalSizeImage(BufferedImage original) { public static BufferedImage getNormalSizeImage(BufferedImage original) {
int srcWidth = original.getWidth(); int srcWidth = original.getWidth();
int srcHeight = original.getHeight(); int srcHeight = original.getHeight();
int tgtWidth = SettingsManager.getManager().getCardSize().width; int tgtWidth = Constants.CARD_SIZE_FULL.width;
int tgtHeight = SettingsManager.getManager().getCardSize().height; int tgtHeight = Constants.CARD_SIZE_FULL.height;
if (srcWidth == tgtWidth && srcHeight == tgtHeight) if (srcWidth == tgtWidth && srcHeight == tgtHeight)
return original; return original;
@ -155,7 +156,7 @@ public class ImageCache {
ResampleOp resampleOp = new ResampleOp(tgtWidth, tgtHeight); ResampleOp resampleOp = new ResampleOp(tgtWidth, tgtHeight);
BufferedImage image = resampleOp.filter(original, null); BufferedImage image = resampleOp.filter(original, null);
return image; return image;
}*/ }
/** /**
* Returns an image scaled to the size appropriate for the card picture * Returns an image scaled to the size appropriate for the card picture
@ -173,7 +174,7 @@ public class ImageCache {
* Returns an image scaled to the size appropriate for the card picture * Returns an image scaled to the size appropriate for the card picture
* panel * panel
*/ */
private static BufferedImage getResizedImage(BufferedImage original, Rectangle sizeNeed) { public static BufferedImage getResizedImage(BufferedImage original, Rectangle sizeNeed) {
ResampleOp resampleOp = new ResampleOp(sizeNeed.width, sizeNeed.height); ResampleOp resampleOp = new ResampleOp(sizeNeed.width, sizeNeed.height);
BufferedImage image = resampleOp.filter(original, null); BufferedImage image = resampleOp.filter(original, null);
return image; return image;