From 21ff8c1b01c5683d832d3ad8585e6fbd97fa8c3b Mon Sep 17 00:00:00 2001
From: leahb <leahb@PC_Leah.lan>
Date: Mon, 19 May 2025 21:32:31 +0200
Subject: [PATCH] little ajustements

---
 src/backend/Board.java                    | 9 +++------
 src/windowInterface/JPanelChessBoard.java | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/backend/Board.java b/src/backend/Board.java
index 6bd2c0b..3fce592 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -14,13 +14,10 @@ public class Board {
 	ArrayList<int[]> highlightedSquares = new ArrayList<>();
 	private boolean pawnDoubleStep;
 	private int xCoordinatePawn;
-	private int yCoordinatePawn;
-//<<<<<<< HEAD
-	private boolean enPassant;
-//=======
+	private int yCoordinatePawn;
+	private boolean enPassant;
 	private boolean isGameOver = false;//flag for when a king is checkmate and no moves can be made anymore
-//>>>>>>> branch 'master' of https://gitarero.ecam.fr/louise.berteloot/OOP_2A5_Project.git
-		
+
 	private ArrayList<Board> previousStates;
 	
 	public Board(int colNum, int lineNum) {
diff --git a/src/windowInterface/JPanelChessBoard.java b/src/windowInterface/JPanelChessBoard.java
index e163bca..d85ffe7 100644
--- a/src/windowInterface/JPanelChessBoard.java
+++ b/src/windowInterface/JPanelChessBoard.java
@@ -85,18 +85,18 @@ public class JPanelChessBoard extends JPanel {
 		if (myGame == null) {
 	        // Display title before game starts
 	        g.setColor(Color.WHITE);
-	        g.setFont(g.getFont().deriveFont(48f)); // larger font size
+	        g.setFont(g.getFont().deriveFont(48f)); 
 	        String title = "Chess Project";
 	        int stringWidth = g.getFontMetrics().stringWidth(title);
 	        int x = (getWidth() - stringWidth) / 2;
 	        int y = getHeight() / 2;
 	        g.drawString(title, x, y);
 	        
-	        g.setFont(g.getFont().deriveFont(24f));  // Smaller font for subtitle
+	        g.setFont(g.getFont().deriveFont(24f));  
 	        String subtitle = "Groupe 2A5";
 	        int subtitleWidth = g.getFontMetrics().stringWidth(subtitle);
 	        int x2 = (getWidth() - subtitleWidth) / 2;
-	        int y2 = y + 40;  // 40 pixels below the title, adjust spacing if needed
+	        int y2 = y + 40;  
 	        g.drawString(subtitle, x2, y2);
 	        
 	        return;