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

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

Browse Source
This commit is contained in:
ROGER
2025-05-16 17:10:15 +02:00
parent 2fec9fc96e
commit 27862eb3cd
8 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/Views/VueBandeauControle.java
View File

@@ -33,8 +33,6 @@ public class VueBandeauControle extends JPanel {
// NEXT PIECE
nextPiecePanel = new JPanel();
// nextPiecePanel.setPreferredSize(new Dimension(100, 100));
// nextPiecePanel.setMaximumSize(new Dimension(100, 100));
nextPiecePanel.setBackground(Color.LIGHT_GRAY);
nextPiecePanel.setAlignmentX(Component.CENTER_ALIGNMENT);
initierNextPiecePanel();
@@ -44,9 +42,9 @@ public class VueBandeauControle extends JPanel {
quitterButton = new JButton("QUITTER");
Dimension buttonSize = new Dimension(85, 30);
Insets margeBoutton = new Insets(2, 2, 2, 2);
// pauseButton.setPreferredSize(buttonSize);
pauseButton.setPreferredSize(buttonSize);
pauseButton.setMargin(margeBoutton);
// quitterButton.setPreferredSize(buttonSize);
quitterButton.setPreferredSize(buttonSize);
quitterButton.setMargin(margeBoutton);
JPanel boutonsPanel = new JPanel();
boutonsPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 10, 0));

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

@@ -26,22 +26,14 @@ public class VueGrille extends JPanel implements Observer, Runnable {
private int nbColonnes;
private JPanel[][] casesGrille;
//private Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
//private double tailleJFrameX = screenSize.getHeight() / 2;
//private double tailleJFrameY = screenSize.getHeight();
public VueGrille(Grille grille, Jeu jeu) {
this.grille = grille;
this.jeu = jeu;
this.nbLignes = grille.getNbLignes();
this.nbColonnes = grille.getNbColonnes();
setLayout(new BorderLayout());
grillePanel = new JPanel(new GridLayoutCarre(nbLignes,nbColonnes));
grillePanel = new JPanel(new GridLayoutCarre(nbLignes,nbColonnes)); //pour que les cases soient carrés
add(grillePanel, BorderLayout.CENTER);
//setSize((int) tailleJFrameX, (int) tailleJFrameY);
//System.err.println("taille " + tailleJFrameX + " " + tailleJFrameY);
//add(this.grillePanel, BorderLayout.CENTER);
//initialiserVueGrille();
casesGrille = new JPanel[nbLignes][nbColonnes];
for (int i = 0; i < nbLignes; i++) {
for (int j = 0; j < nbColonnes; j++) {

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

@@ -13,13 +13,14 @@ public class VueTetris extends JFrame {
public static double tailleJFrameX = screenSize.getHeight() / 2;
public static double tailleJFrameY = screenSize.getHeight() / 2;
private VueGrille vueGrille;
private VueBandeauControle vueControle;
public VueTetris(Grille grille, Jeu jeu) {
super("Tetris");
VueGrille vueGrille = new VueGrille(grille, jeu);
VueBandeauControle vueControle = new VueBandeauControle();
TetrisBandeauControleur controleur = new TetrisBandeauControleur(vueControle);
this.vueGrille = new VueGrille(grille, jeu);
this.vueControle = new VueBandeauControle();
//TetrisBandeauControleur controleur = new TetrisBandeauControleur(vueControle);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setLayout(new BorderLayout());
@@ -44,4 +45,8 @@ public class VueTetris extends JFrame {
// Utilisation de la pièce L
vueControle.afficherPieceSuivante(jeu.getPieceSuivante());
}
public VueBandeauControle getVueBandeauControle() {
return this.vueControle;
}
}