Morph01/Tetris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit a8f543114e
Author: ROGER <gwendal.roger@etu.univ-lyon1.fr>
Date:   Mon May 19 21:59:38 2025 +0200

    ajout d'une fonctionnalité permettant de mettre en pause le Jeu grace à un bouton. Ajout d'un vérouillage du clavier pendant lause

commit 27862eb3cd
Author: ROGER <gwendal.roger@etu.univ-lyon1.fr>
Date:   Fri May 16 17:10:15 2025 +0200

    Ajoute de l'arret de la musique en fin de partie + arret propre de l'ordonanceur

commit 2fec9fc96e
Author: ROGER <gwendal.roger@etu.univ-lyon1.fr>
Date:   Fri May 16 16:17:58 2025 +0200

    integration du responsive dans l'affichage de la grille
This commit is contained in:
Morph01
2025-05-19 22:16:42 +02:00
committed by Morph01
parent 85aafa8240
commit aa6ab95728
6 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/Views/VueGrille.java
View File

@@ -1,5 +1,6 @@
package org.Views;
import javax.swing.*;
import javax.swing.*;
import org.Models.*;
@@ -32,14 +33,14 @@ public class VueGrille extends JPanel implements Observer, Runnable {
this.nbLignes = grille.getNbLignes();
this.nbColonnes = grille.getNbColonnes();
setLayout(new BorderLayout());
grillePanel = new JPanel(new GridLayoutCarre(nbLignes,nbColonnes)); //pour que les cases soient carrés
grillePanel = new JPanel(new GridLayoutCarre(nbLignes, nbColonnes)); // pour que les cases soient carrés
add(grillePanel, BorderLayout.CENTER);
casesGrille = new JPanel[nbLignes][nbColonnes];
for (int i = 0; i < nbLignes; i++) {
for (int j = 0; j < nbColonnes; j++) {
JPanel caseG = new JPanel(){
JPanel caseG = new JPanel() {
@Override
public Dimension getPreferredSize(){
public Dimension getPreferredSize() {
return super.getPreferredSize();
}
};
@@ -60,7 +61,7 @@ public class VueGrille extends JPanel implements Observer, Runnable {
public void resizeCases() {
int largeurPanel = grillePanel.getWidth();
int hauteurPanel = grillePanel.getHeight();
if (largeurPanel==0||hauteurPanel==0) {
if (largeurPanel == 0 || hauteurPanel == 0) {
return;
}
int taille = Math.min(largeurPanel, hauteurPanel);
@@ -71,7 +72,7 @@ public class VueGrille extends JPanel implements Observer, Runnable {
int tailleCaseX = largeurPanel / nbColonnes;
int tailleCaseY = hauteurPanel / nbLignes;
int tailleCase = Math.min(tailleCaseX, tailleCaseY);
Dimension taillePreferee=new Dimension(tailleCase, tailleCase);
Dimension taillePreferee = new Dimension(tailleCase, tailleCase);
for (int i = 0; i < nbLignes; i++) {
for (int j = 0; j < nbColonnes; j++) {
casesGrille[i][j].setPreferredSize(taillePreferee);