diff --git a/.gitattributes b/.gitattributes index b0d99e4cd8b..205ebe0ac62 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9857,41 +9857,16 @@ res/images/deckeditor/filter_white_y.png -text svneol=unset#image/png res/images/skins/default/bg_match.jpg -text res/images/skins/default/bg_splash.jpg -text res/images/skins/default/bg_texture.jpg -text -res/images/skins/default/btnLdown.png -text -res/images/skins/default/btnLover.png -text -res/images/skins/default/btnLup.png -text -res/images/skins/default/btnMdown.png -text -res/images/skins/default/btnMover.png -text -res/images/skins/default/btnMup.png -text -res/images/skins/default/btnRdown.png -text -res/images/skins/default/btnRover.png -text -res/images/skins/default/btnRup.png -text res/images/skins/default/font1.ttf -text res/images/skins/default/sprite.png -text res/images/skins/rebel/bg_match.jpg -text res/images/skins/rebel/bg_splash.jpg -text -res/images/skins/rebel/btnLdown.png -text -res/images/skins/rebel/btnLover.png -text -res/images/skins/rebel/btnLup.png -text -res/images/skins/rebel/btnMdown.png -text -res/images/skins/rebel/btnMover.png -text -res/images/skins/rebel/btnMup.png -text -res/images/skins/rebel/btnRdown.png -text -res/images/skins/rebel/btnRover.png -text -res/images/skins/rebel/btnRup.png -text +res/images/skins/rebel/bg_texture.jpg -text res/images/skins/rebel/font1.ttf -text res/images/skins/rebel/sprite.png -text res/images/skins/smith/bg_match.jpg -text res/images/skins/smith/bg_splash.jpg -text -res/images/skins/smith/btnLdown.png -text -res/images/skins/smith/btnLover.png -text -res/images/skins/smith/btnLup.png -text -res/images/skins/smith/btnMdown.png -text -res/images/skins/smith/btnMover.png -text -res/images/skins/smith/btnMup.png -text -res/images/skins/smith/btnRdown.png -text -res/images/skins/smith/btnRover.png -text -res/images/skins/smith/btnRup.png -text +res/images/skins/smith/bg_texture.jpg -text res/images/skins/smith/font1.ttf -text res/images/skins/smith/sprite.png -text res/images/symbols-13/0.png -text svneol=unset#image/png diff --git a/res/images/skins/default/btnLdown.png b/res/images/skins/default/btnLdown.png deleted file mode 100644 index 1ebc3acbe33..00000000000 Binary files a/res/images/skins/default/btnLdown.png and /dev/null differ diff --git a/res/images/skins/default/btnLover.png b/res/images/skins/default/btnLover.png deleted file mode 100644 index f1c1d5a88a1..00000000000 Binary files a/res/images/skins/default/btnLover.png and /dev/null differ diff --git a/res/images/skins/default/btnLup.png b/res/images/skins/default/btnLup.png deleted file mode 100644 index 26a28d34e1c..00000000000 Binary files a/res/images/skins/default/btnLup.png and /dev/null differ diff --git a/res/images/skins/default/btnMdown.png b/res/images/skins/default/btnMdown.png deleted file mode 100644 index d53b4fff943..00000000000 Binary files a/res/images/skins/default/btnMdown.png and /dev/null differ diff --git a/res/images/skins/default/btnMover.png b/res/images/skins/default/btnMover.png deleted file mode 100644 index 7e23fca1e26..00000000000 Binary files a/res/images/skins/default/btnMover.png and /dev/null differ diff --git a/res/images/skins/default/btnMup.png b/res/images/skins/default/btnMup.png deleted file mode 100644 index f71f8d36d89..00000000000 Binary files a/res/images/skins/default/btnMup.png and /dev/null differ diff --git a/res/images/skins/default/btnRdown.png b/res/images/skins/default/btnRdown.png deleted file mode 100644 index bd2037c3329..00000000000 Binary files a/res/images/skins/default/btnRdown.png and /dev/null differ diff --git a/res/images/skins/default/btnRover.png b/res/images/skins/default/btnRover.png deleted file mode 100644 index 89568942f54..00000000000 Binary files a/res/images/skins/default/btnRover.png and /dev/null differ diff --git a/res/images/skins/default/btnRup.png b/res/images/skins/default/btnRup.png deleted file mode 100644 index 1f70fe6b5fc..00000000000 Binary files a/res/images/skins/default/btnRup.png and /dev/null differ diff --git a/res/images/skins/default/sprite.png b/res/images/skins/default/sprite.png index 9d09dc325bb..0b36b05843e 100644 Binary files a/res/images/skins/default/sprite.png and b/res/images/skins/default/sprite.png differ diff --git a/res/images/skins/rebel/bg_texture.jpg b/res/images/skins/rebel/bg_texture.jpg new file mode 100644 index 00000000000..ba0c61e3693 Binary files /dev/null and b/res/images/skins/rebel/bg_texture.jpg differ diff --git a/res/images/skins/rebel/btnLdown.png b/res/images/skins/rebel/btnLdown.png deleted file mode 100644 index 018d6fbf67e..00000000000 Binary files a/res/images/skins/rebel/btnLdown.png and /dev/null differ diff --git a/res/images/skins/rebel/btnLover.png b/res/images/skins/rebel/btnLover.png deleted file mode 100644 index a143747f215..00000000000 Binary files a/res/images/skins/rebel/btnLover.png and /dev/null differ diff --git a/res/images/skins/rebel/btnLup.png b/res/images/skins/rebel/btnLup.png deleted file mode 100644 index 756fb2782f5..00000000000 Binary files a/res/images/skins/rebel/btnLup.png and /dev/null differ diff --git a/res/images/skins/rebel/btnMdown.png b/res/images/skins/rebel/btnMdown.png deleted file mode 100644 index 9cd95dd77d2..00000000000 Binary files a/res/images/skins/rebel/btnMdown.png and /dev/null differ diff --git a/res/images/skins/rebel/btnMover.png b/res/images/skins/rebel/btnMover.png deleted file mode 100644 index 855eebf9cb2..00000000000 Binary files a/res/images/skins/rebel/btnMover.png and /dev/null differ diff --git a/res/images/skins/rebel/btnMup.png b/res/images/skins/rebel/btnMup.png deleted file mode 100644 index faf91bd85cc..00000000000 Binary files a/res/images/skins/rebel/btnMup.png and /dev/null differ diff --git a/res/images/skins/rebel/btnRdown.png b/res/images/skins/rebel/btnRdown.png deleted file mode 100644 index 2a5f9fd2798..00000000000 Binary files a/res/images/skins/rebel/btnRdown.png and /dev/null differ diff --git a/res/images/skins/rebel/btnRover.png b/res/images/skins/rebel/btnRover.png deleted file mode 100644 index a44fa611caa..00000000000 Binary files a/res/images/skins/rebel/btnRover.png and /dev/null differ diff --git a/res/images/skins/rebel/btnRup.png b/res/images/skins/rebel/btnRup.png deleted file mode 100644 index f2ef29a1350..00000000000 Binary files a/res/images/skins/rebel/btnRup.png and /dev/null differ diff --git a/res/images/skins/rebel/sprite.png b/res/images/skins/rebel/sprite.png index 8d972c8f9aa..85f4360fb44 100644 Binary files a/res/images/skins/rebel/sprite.png and b/res/images/skins/rebel/sprite.png differ diff --git a/res/images/skins/smith/bg_texture.jpg b/res/images/skins/smith/bg_texture.jpg new file mode 100644 index 00000000000..9bf4763c26c Binary files /dev/null and b/res/images/skins/smith/bg_texture.jpg differ diff --git a/res/images/skins/smith/btnLdown.png b/res/images/skins/smith/btnLdown.png deleted file mode 100644 index 1ebc3acbe33..00000000000 Binary files a/res/images/skins/smith/btnLdown.png and /dev/null differ diff --git a/res/images/skins/smith/btnLover.png b/res/images/skins/smith/btnLover.png deleted file mode 100644 index f1c1d5a88a1..00000000000 Binary files a/res/images/skins/smith/btnLover.png and /dev/null differ diff --git a/res/images/skins/smith/btnLup.png b/res/images/skins/smith/btnLup.png deleted file mode 100644 index 26a28d34e1c..00000000000 Binary files a/res/images/skins/smith/btnLup.png and /dev/null differ diff --git a/res/images/skins/smith/btnMdown.png b/res/images/skins/smith/btnMdown.png deleted file mode 100644 index d53b4fff943..00000000000 Binary files a/res/images/skins/smith/btnMdown.png and /dev/null differ diff --git a/res/images/skins/smith/btnMover.png b/res/images/skins/smith/btnMover.png deleted file mode 100644 index 7e23fca1e26..00000000000 Binary files a/res/images/skins/smith/btnMover.png and /dev/null differ diff --git a/res/images/skins/smith/btnMup.png b/res/images/skins/smith/btnMup.png deleted file mode 100644 index f71f8d36d89..00000000000 Binary files a/res/images/skins/smith/btnMup.png and /dev/null differ diff --git a/res/images/skins/smith/btnRdown.png b/res/images/skins/smith/btnRdown.png deleted file mode 100644 index bd2037c3329..00000000000 Binary files a/res/images/skins/smith/btnRdown.png and /dev/null differ diff --git a/res/images/skins/smith/btnRover.png b/res/images/skins/smith/btnRover.png deleted file mode 100644 index 89568942f54..00000000000 Binary files a/res/images/skins/smith/btnRover.png and /dev/null differ diff --git a/res/images/skins/smith/btnRup.png b/res/images/skins/smith/btnRup.png deleted file mode 100644 index 1f70fe6b5fc..00000000000 Binary files a/res/images/skins/smith/btnRup.png and /dev/null differ diff --git a/res/images/skins/smith/sprite.png b/res/images/skins/smith/sprite.png index 065d5b64542..47a7663ac7e 100644 Binary files a/res/images/skins/smith/sprite.png and b/res/images/skins/smith/sprite.png differ diff --git a/src/main/java/forge/view/home/SplashFrame.java b/src/main/java/forge/view/home/SplashFrame.java index 44946dfaa4d..fa0f1811e61 100644 --- a/src/main/java/forge/view/home/SplashFrame.java +++ b/src/main/java/forge/view/home/SplashFrame.java @@ -86,7 +86,7 @@ public class SplashFrame extends JFrame { this.setUndecorated(true); // Set preferred JFrame properties. - final ImageIcon bgIcon = skin.getImage("bg.splash"); + final ImageIcon bgIcon = new ImageIcon(skin.getImage("bg.splash")); final int splashWidthPx = bgIcon.getIconWidth(); final int splashHeightPx = bgIcon.getIconHeight(); diff --git a/src/main/java/forge/view/match/ViewDock.java b/src/main/java/forge/view/match/ViewDock.java index 36d47699829..6f181fd7a87 100644 --- a/src/main/java/forge/view/match/ViewDock.java +++ b/src/main/java/forge/view/match/ViewDock.java @@ -234,7 +234,7 @@ public class ViewDock extends FRoundedPanel { overlay.showOverlay(); final FPanel parent = new FPanel(); - parent.setBGImg(this.skin.getImage("bg.texture")); + parent.setBGImg(new ImageIcon(this.skin.getImage("bg.texture"))); parent.setBorder(new LineBorder(this.skin.getColor("borders"), 1)); parent.setLayout(new MigLayout("insets 0, wrap 2, ax center, ay center")); overlay.add(parent, "w 80%!, h 80%!, gaptop 10%, gapleft 10%, span 2 1"); diff --git a/src/main/java/forge/view/match/ViewTopLevel.java b/src/main/java/forge/view/match/ViewTopLevel.java index 351776a95d1..fca3c2957f7 100644 --- a/src/main/java/forge/view/match/ViewTopLevel.java +++ b/src/main/java/forge/view/match/ViewTopLevel.java @@ -26,6 +26,7 @@ import java.awt.event.MouseMotionAdapter; import java.util.ArrayList; import java.util.List; +import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JTextArea; @@ -105,8 +106,8 @@ public class ViewTopLevel extends FPanel implements CardContainer, Display { // Set properties this.setOpaque(false); - this.setBGTexture(AllZone.getSkin().getImage("bg.texture")); - this.setBGImg(AllZone.getSkin().getImage("bg.match")); + this.setBGTexture(new ImageIcon(AllZone.getSkin().getImage("bg.texture"))); + this.setBGImg(new ImageIcon(AllZone.getSkin().getImage("bg.match"))); this.setLayout(null); b = (int) Math.ceil(BOUNDARY_THICKNESS_PX / 2); diff --git a/src/main/java/forge/view/toolbox/FButton.java b/src/main/java/forge/view/toolbox/FButton.java index 39b9f333535..ec03db750ba 100644 --- a/src/main/java/forge/view/toolbox/FButton.java +++ b/src/main/java/forge/view/toolbox/FButton.java @@ -69,9 +69,9 @@ public class FButton extends JButton { this.setContentAreaFilled(false); this.setMargin(new Insets(0, 25, 0, 25)); this.setFont(this.skin.getFont1().deriveFont(Font.BOLD, 15)); - this.imgL = this.skin.getBtnLup().getImage(); - this.imgM = this.skin.getBtnMup().getImage(); - this.imgR = this.skin.getBtnRup().getImage(); + this.imgL = skin.getImage("button.upLEFT"); + this.imgM = skin.getImage("button.upCENTER"); + this.imgR = skin.getImage("button.upRIGHT"); if ((this.imgL != null) && (this.imgM != null) && (this.imgR != null)) { this.allImagesPresent = true; @@ -81,27 +81,27 @@ public class FButton extends JButton { @Override public void mouseEntered(final java.awt.event.MouseEvent evt) { if (FButton.this.isEnabled()) { - FButton.this.imgL = FButton.this.skin.getBtnLover().getImage(); - FButton.this.imgM = FButton.this.skin.getBtnMover().getImage(); - FButton.this.imgR = FButton.this.skin.getBtnRover().getImage(); + FButton.this.imgL = FButton.this.skin.getImage("button.overLEFT"); + FButton.this.imgM = FButton.this.skin.getImage("button.overCENTER"); + FButton.this.imgR = FButton.this.skin.getImage("button.overRIGHT"); } } @Override public void mouseExited(final java.awt.event.MouseEvent evt) { if (FButton.this.isEnabled()) { - FButton.this.imgL = FButton.this.skin.getBtnLup().getImage(); - FButton.this.imgM = FButton.this.skin.getBtnMup().getImage(); - FButton.this.imgR = FButton.this.skin.getBtnRup().getImage(); + FButton.this.imgL = FButton.this.skin.getImage("button.upLEFT"); + FButton.this.imgM = FButton.this.skin.getImage("button.upCENTER"); + FButton.this.imgR = FButton.this.skin.getImage("button.upRIGHT"); } } @Override public void mousePressed(final java.awt.event.MouseEvent evt) { if (FButton.this.isEnabled()) { - FButton.this.imgL = FButton.this.skin.getBtnLdown().getImage(); - FButton.this.imgM = FButton.this.skin.getBtnMdown().getImage(); - FButton.this.imgR = FButton.this.skin.getBtnRdown().getImage(); + FButton.this.imgL = FButton.this.skin.getImage("button.downLEFT"); + FButton.this.imgM = FButton.this.skin.getImage("button.downCENTER"); + FButton.this.imgR = FButton.this.skin.getImage("button.downRIGHT"); } } }); diff --git a/src/main/java/forge/view/toolbox/FSkin.java b/src/main/java/forge/view/toolbox/FSkin.java index e677b43b935..35078448093 100644 --- a/src/main/java/forge/view/toolbox/FSkin.java +++ b/src/main/java/forge/view/toolbox/FSkin.java @@ -20,6 +20,7 @@ package forge.view.toolbox; import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; +import java.awt.Image; import java.awt.RenderingHints; import java.awt.image.BufferedImage; import java.io.File; @@ -39,59 +40,15 @@ import forge.gui.GuiUtils; */ public class FSkin { - private Map icons; + private Map icons; private Map colors; - private Map images; + private Map images; + - // ===== Public fields - /** Primary font used in titles and buttons and most text output. */ private Font font1 = null; - - /** Left side of button, up state. */ - private ImageIcon btnLup = null; - - /** Middle of button, up state. */ - private ImageIcon btnMup = null; - - /** Right side of button, up state. */ - private ImageIcon btnRup = null; - - /** Button, left side, over state. */ - private ImageIcon btnLover = null; - - /** Button, middle, over state. */ - private ImageIcon btnMover = null; - - /** Button, right side, over state. */ - private ImageIcon btnRover = null; - - /** Button, left side, down state. */ - private ImageIcon btnLdown = null; - - /** Button, middle, down state. */ - private ImageIcon btnMdown = null; - - /** Button, right side, down state. */ - private ImageIcon btnRdown = null; - - /** Name of skin. */ private final String name = "default"; - - // ===== Private fields private final String spriteFile = ""; private final String font1file = "font1.ttf"; - - private final String btnLupfile = "btnLup.png"; - private final String btnMupfile = "btnMup.png"; - private final String btnRupfile = "btnRup.png"; - private final String btnLoverfile = "btnLover.png"; - private final String btnMoverfile = "btnMover.png"; - private final String btnRoverfile = "btnRover.png"; - private final String btnLdownfile = "btnLdown.png"; - private final String btnMdownfile = "btnMdown.png"; - private final String btnRdownfile = "btnRdown.png"; - - private ImageIcon tempImg; private Font tempFont; private final String notfound = "FSkin.java: Can't find "; @@ -127,9 +84,9 @@ public class FSkin { private void loadFontAndImages(final String skinName) { final String dirName = "res/images/skins/" + skinName + "/"; - icons = new HashMap(); + icons = new HashMap(); colors = new HashMap(); - images = new HashMap(); + images = new HashMap(); // Fonts this.setFont1(this.retrieveFont(dirName + this.font1file)); @@ -139,16 +96,6 @@ public class FSkin { this.setImage("bg.match", this.retrieveImage(dirName + "bg_match.jpg")); this.setImage("bg.splash", this.retrieveImage(dirName + "bg_splash.jpg")); - this.setBtnLup(this.retrieveImage(dirName + this.btnLupfile)); - this.setBtnMup(this.retrieveImage(dirName + this.btnMupfile)); - this.setBtnRup(this.retrieveImage(dirName + this.btnRupfile)); - this.setBtnLover(this.retrieveImage(dirName + this.btnLoverfile)); - this.setBtnMover(this.retrieveImage(dirName + this.btnMoverfile)); - this.setBtnRover(this.retrieveImage(dirName + this.btnRoverfile)); - this.setBtnLdown(this.retrieveImage(dirName + this.btnLdownfile)); - this.setBtnMdown(this.retrieveImage(dirName + this.btnMdownfile)); - this.setBtnRdown(this.retrieveImage(dirName + this.btnRdownfile)); - // Sprite final File file = new File(dirName + "sprite.png"); BufferedImage image; @@ -188,11 +135,26 @@ public class FSkin { this.setIcon("dock.concede", image.getSubimage(80, 80, 80, 80)); this.setIcon("dock.endturn", image.getSubimage(80, 0, 80, 80)); this.setIcon("dock.concede", image.getSubimage(80, 80, 80, 80)); - this.setIcon("dock.decklist", image.getSubimage(60, 140, 20, 20)); + this.setIcon("dock.decklist", image.getSubimage(80, 160, 80, 80)); + + this.setImage("button.upLEFT", image.getSubimage(360, 0, 40, 40)); + this.setImage("button.upCENTER", image.getSubimage(400, 0, 1, 40)); + this.setImage("button.upRIGHT", image.getSubimage(440, 0, 40, 40)); + + this.setImage("button.overLEFT", image.getSubimage(360, 40, 40, 40)); + this.setImage("button.overCENTER", image.getSubimage(400, 40, 1, 40)); + this.setImage("button.overRIGHT", image.getSubimage(440, 40, 40, 40)); + + this.setImage("button.downLEFT", image.getSubimage(360, 80, 40, 40)); + this.setImage("button.downCENTER", image.getSubimage(400, 80, 1, 40)); + this.setImage("button.downRIGHT", image.getSubimage(440, 80, 40, 40)); + + this.setImage("button.focusLEFT", image.getSubimage(360, 120, 40, 40)); + this.setImage("button.focusCENTER", image.getSubimage(400, 120, 1, 40)); + this.setImage("button.focusRIGHT", image.getSubimage(440, 120, 40, 40)); } catch (final IOException e) { System.err.println(this.notfound + this.spriteFile); } - } /** @@ -205,14 +167,14 @@ public class FSkin { * @param {@link java.lang.String} address * @return a ImageIcon */ - private ImageIcon retrieveImage(final String address) { - this.tempImg = new ImageIcon(address); + private Image retrieveImage(final String address) { + ImageIcon tempImg = new ImageIcon(address); - if (this.tempImg.getIconWidth() == -1) { + if (tempImg.getIconWidth() == -1) { System.err.println(this.notfound + address); } - return this.tempImg; + return tempImg.getImage(); } /** @@ -266,177 +228,6 @@ public class FSkin { this.font1 = font10; } - /** - * Left side of button, up state. - * - * @return {@link javax.swing.ImageIcon} btnLup - */ - public ImageIcon getBtnLup() { - return this.btnLup; - } - - /** - * Left side of button, up state. - * - * @param btnLup0 - *   an image icon - */ - public void setBtnLup(final ImageIcon btnLup0) { - this.btnLup = btnLup0; - } - - /** - * Middle of button, up state. - * - * @return {@link javax.swing.ImageIcon} btnMup - */ - public ImageIcon getBtnMup() { - return this.btnMup; - } - - /** - * Middle of button, up state. - * - * @param btnMup0 - *   an image icon - */ - public void setBtnMup(final ImageIcon btnMup0) { - this.btnMup = btnMup0; - } - - /** - * Right side of button, up state. - * - * @return {@link javax.swing.ImageIcon} btnRup - */ - public ImageIcon getBtnRup() { - return this.btnRup; - } - - /** - * Right side of button, up state. - * - * @param btnRup0 - *   an image icon - */ - public void setBtnRup(final ImageIcon btnRup0) { - this.btnRup = btnRup0; - } - - /** - * Left side of button, over state. - * - * @return {@link javax.swing.ImageIcon} btnLover - */ - public ImageIcon getBtnLover() { - return this.btnLover; - } - - /** - * Left side of button, over state. - * - * @param btnLover0 - *   an image icon - */ - public void setBtnLover(final ImageIcon btnLover0) { - this.btnLover = btnLover0; - } - - /** - * Middle of button, over state. - * - * @return {@link javax.swing.ImageIcon} btnMover - */ - public ImageIcon getBtnMover() { - return this.btnMover; - } - - /** - * Middle of button, over state. - * - * @param btnMover0 - *   an image icon - */ - public void setBtnMover(final ImageIcon btnMover0) { - this.btnMover = btnMover0; - } - - /** - * Right side of button, over state. - * - * @return {@link javax.swing.ImageIcon} btnRover - */ - public ImageIcon getBtnRover() { - return this.btnRover; - } - - /** - * Right side of button, over state. - * - * @param btnRover0 - *   an image icon - */ - public void setBtnRover(final ImageIcon btnRover0) { - this.btnRover = btnRover0; - } - - /** - * Left side of button, down state. - * - * @return an image icon - */ - public ImageIcon getBtnLdown() { - return this.btnLdown; - } - - /** - * Left side of button, down state. - * - * @param btnLdown0 - *   an image icon - */ - public void setBtnLdown(final ImageIcon btnLdown0) { - this.btnLdown = btnLdown0; - } - - /** - * Right side of button, down state. - * - * @return an image icon - */ - public ImageIcon getBtnRdown() { - return this.btnRdown; - } - - /** - * Right side of button, down state. - * - * @param btnRdown0 - * an image icon - */ - public void setBtnRdown(final ImageIcon btnRdown0) { - this.btnRdown = btnRdown0; - } - - /** - * Middle of button, down state. - * - * @return an image icon - */ - public ImageIcon getBtnMdown() { - return this.btnMdown; - } - - /** - * Sets the btn mdown. - * - * @param btnMdown0 - *   an image icon - */ - public void setBtnMdown(final ImageIcon btnMdown0) { - this.btnMdown = btnMdown0; - } - /** * Gets the name. * @@ -451,7 +242,7 @@ public class FSkin { * @return ImageIcon */ public ImageIcon getIcon(String s0) { - return new ImageIcon(icons.get(s0)); + return icons.get(s0); } /** @@ -466,7 +257,7 @@ public class FSkin { w0 = (w0 < 1) ? 1 : w0; h0 = (h0 < 1) ? 1 : h0; - BufferedImage original = icons.get(s0); + BufferedImage original = (BufferedImage) icons.get(s0).getImage(); BufferedImage scaled = new BufferedImage(w0, h0, BufferedImage.TYPE_INT_ARGB); Graphics2D g2d = scaled.createGraphics(); @@ -478,13 +269,23 @@ public class FSkin { } /** - * Sets an icon in this skin's icon map. + * Sets an icon in this skin's icon map from a BufferedImage. * * @param s0   String address * @param bi0   BufferedImage */ public void setIcon(String s0, BufferedImage bi0) { - icons.put(s0, bi0); + icons.put(s0, new ImageIcon(bi0)); + } + + /** + * Sets an icon in this skin's icon map from an ImageIcon. + * + * @param s0   String address + * @param i0   ImageIcon + */ + public void setIcon(String s0, ImageIcon i0) { + icons.put(s0, i0); } /** @@ -511,9 +312,9 @@ public class FSkin { * Retrieves an image from this skin's image map. * * @param s0   String color address - * @return Color + * @return BufferedImage */ - public ImageIcon getImage(String s0) { + public Image getImage(String s0) { return images.get(s0); } @@ -521,9 +322,9 @@ public class FSkin { * Sets an image in this skin's image map. * * @param s0   String address - * @param i0   ImageIcon + * @param bi0   ImageIcon */ - public void setImage(String s0, ImageIcon i0) { - images.put(s0, i0); + public void setImage(String s0, Image bi0) { + images.put(s0, bi0); } } diff --git a/src/main/java/forge/view/toolbox/WinLoseFrame.java b/src/main/java/forge/view/toolbox/WinLoseFrame.java index 823512720b5..98810cc1d2a 100644 --- a/src/main/java/forge/view/toolbox/WinLoseFrame.java +++ b/src/main/java/forge/view/toolbox/WinLoseFrame.java @@ -25,6 +25,7 @@ import java.awt.Graphics; import java.awt.Rectangle; import java.awt.event.ActionEvent; +import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; @@ -107,7 +108,7 @@ public class WinLoseFrame extends JFrame { // Place all content in FPanel final FPanel contentPanel = new FPanel(new MigLayout("wrap, fill, insets 20 0 10 10")); - contentPanel.setBGTexture(AllZone.getSkin().getImage("bg.texture")); + contentPanel.setBGTexture(new ImageIcon(AllZone.getSkin().getImage("bg.texture"))); contentPanel.setBorder(new WinLoseBorder()); this.getContentPane().add(contentPanel);