From 4b274e3d0f44d8c9aefc768c4b338cdbc33580d4 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 2 Jul 2019 22:06:48 +0200
Subject: [PATCH] Fixed board size issues

- TextureLoader does not perform scaling anymore
+ Scaling method in BoardPanel
---
 src/dev/kske/chess/BoardPanel.java    | 27 +++++++++++++--------------
 src/dev/kske/chess/Chess.java         |  4 +++-
 src/dev/kske/chess/TextureLoader.java | 10 ++++------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/dev/kske/chess/BoardPanel.java b/src/dev/kske/chess/BoardPanel.java
index 163d5c5..dbe5491 100644
--- a/src/dev/kske/chess/BoardPanel.java
+++ b/src/dev/kske/chess/BoardPanel.java
@@ -1,7 +1,6 @@
 package dev.kske.chess;
 
 import java.awt.Color;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -38,6 +37,10 @@ public class BoardPanel extends JPanel {
 
 	private Board board;
 
+	static {
+		loadPieceTextures();
+	}
+
 	public BoardPanel(Board board) {
 		this();
 		setSize(getPreferredSize());
@@ -55,9 +58,7 @@ public class BoardPanel extends JPanel {
 			@Override
 			public void componentResized(ComponentEvent e) {
 				tileSize = getWidth() / 8;
-
-				// Load the piece textures if they are not present
-				if (textures == null) loadPieceTextures();
+				scalePieceTextures();
 			}
 		});
 
@@ -110,6 +111,13 @@ public class BoardPanel extends JPanel {
 			textures.put(file.getName().replaceFirst("[.][^.]+$", ""), TextureLoader.loadScaledImage(file, tileSize));
 	}
 
+	/**
+	 * Scales all piece textures to fit the current tile size
+	 */
+	private static void scalePieceTextures() {
+		textures.replaceAll((key, img) -> img.getScaledInstance(tileSize, tileSize, Image.SCALE_SMOOTH));
+	}
+
 	/**
 	 * Loads a piece texture fitting to a piece object
 	 * 
@@ -128,16 +136,7 @@ public class BoardPanel extends JPanel {
 	public Dimension getMaximumSize() { return getPreferredSize(); }
 
 	@Override
-	public Dimension getPreferredSize() {
-		Dimension	d	= super.getPreferredSize();
-		Container	c	= getParent();
-		if (c != null) d = c.getSize();
-		else return new Dimension(480, 480);
-		int	w	= (int) d.getWidth();
-		int	h	= (int) d.getHeight();
-		int	s	= Math.max(w, h);
-		return new Dimension(s, s);
-	}
+	public Dimension getPreferredSize() { return new Dimension(480, 480); }
 
 	public Board getBoard() { return board; }
 
diff --git a/src/dev/kske/chess/Chess.java b/src/dev/kske/chess/Chess.java
index 2848563..fe30759 100644
--- a/src/dev/kske/chess/Chess.java
+++ b/src/dev/kske/chess/Chess.java
@@ -45,12 +45,14 @@ public class Chess {
 	 */
 	private void initialize() {
 		mframe = new JFrame();
-		mframe.setBounds(100, 100, 740, 740);
+		mframe.setResizable(false);
+		mframe.setBounds(100, 100, 729, 737);
 		mframe.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
 		BoardPanel boardPanel = new BoardPanel(new Board());
 		boardPanel.setLayout(null);
 		mframe.getContentPane().add(boardPanel, BorderLayout.CENTER);
+		mframe.pack();
 	}
 
 }
diff --git a/src/dev/kske/chess/TextureLoader.java b/src/dev/kske/chess/TextureLoader.java
index c690291..e8f7ed2 100644
--- a/src/dev/kske/chess/TextureLoader.java
+++ b/src/dev/kske/chess/TextureLoader.java
@@ -18,11 +18,10 @@ public class TextureLoader {
 	private TextureLoader() {}
 
 	/**
-	 * Loads an image from a file and scales it to a square.
+	 * Loads an image from a file.
 	 * 
-	 * @param file  The image file
-	 * @param scale The side length of the square to which the image will be scaled
-	 * @return The scaled image
+	 * @param file The image file
+	 * @return The loaded image
 	 */
 	public static Image loadScaledImage(File file, int scale) {
 		BufferedImage in = null;
@@ -31,7 +30,6 @@ public class TextureLoader {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		Image scaled = in.getScaledInstance(scale, scale, Image.SCALE_SMOOTH);
-		return scaled;
+		return in;
 	}
 }