From 63b12cbf9ac3e330c59994f5f93d2583068e78d0 Mon Sep 17 00:00:00 2001
From: Chiara <chiara.relevat@oulook.fr>
Date: Tue, 5 May 2020 10:50:49 +0200
Subject: [PATCH] modif barre de vie plateau

---
 src/ihm/controller/PlayersController.java |  1 -
 src/ihm/ressources/PlateauTest2.fxml      | 80 ++++++++++-------------
 src/ihm/ressources/style/plateau.css      |  5 ++
 3 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/src/ihm/controller/PlayersController.java b/src/ihm/controller/PlayersController.java
index ec33f24..09c7a28 100644
--- a/src/ihm/controller/PlayersController.java
+++ b/src/ihm/controller/PlayersController.java
@@ -66,7 +66,6 @@ public class PlayersController implements Initializable{
 		ligne.add(hb7);
 		ligne.add(hb8);
 		for (HBox hb : ligne) {
-			System.out.println(hb);
 			txt.add((TextField) hb.getChildren().get(0));
 			plus.add((Button) hb.getChildren().get(1));
 			ia.add((CheckBox) hb.getChildren().get(2));
diff --git a/src/ihm/ressources/PlateauTest2.fxml b/src/ihm/ressources/PlateauTest2.fxml
index 3233098..8c4f657 100644
--- a/src/ihm/ressources/PlateauTest2.fxml
+++ b/src/ihm/ressources/PlateauTest2.fxml
@@ -355,7 +355,7 @@
                                     </GridPane>
                                  </children>
                               </GridPane>
-                              <Button mnemonicParsing="false" onMouseClicked="#mettreEnPause" styleClass="bouton">
+                              <Button mnemonicParsing="false" onMouseClicked="#mettreEnPause" styleClass="boutonPause">
                                  <graphic>
                                     <ImageView fitHeight="44.0" fitWidth="38.0" pickOnBounds="true" preserveRatio="true">
                                        <image>
@@ -382,6 +382,8 @@
                                     <ColumnConstraints hgrow="SOMETIMES" />
                                     <ColumnConstraints hgrow="SOMETIMES" />
                                     <ColumnConstraints hgrow="SOMETIMES" />
+                                    <ColumnConstraints hgrow="SOMETIMES" />
+                                    <ColumnConstraints hgrow="SOMETIMES" />
                                 </columnConstraints>
                                 <rowConstraints>
                                   <RowConstraints vgrow="SOMETIMES" />
@@ -412,7 +414,7 @@
                                        </children>
                                        <styleClass>
                                           <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
+                                          <String fx:value="un" />
                                        </styleClass>
                                     </StackPane>
                                     <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="2">
@@ -426,7 +428,7 @@
                                        </children>
                                        <styleClass>
                                           <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
+                                          <String fx:value="deux" />
                                        </styleClass>
                                     </StackPane>
                                     <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="3">
@@ -440,7 +442,7 @@
                                        </children>
                                        <styleClass>
                                           <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
+                                          <String fx:value="trois" />
                                        </styleClass>
                                     </StackPane>
                                     <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="4">
@@ -454,10 +456,10 @@
                                        </children>
                                        <styleClass>
                                           <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
+                                          <String fx:value="quatre" />
                                        </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="5">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="5">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -466,12 +468,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="6">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="6">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -480,12 +478,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="7">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="7">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -494,12 +488,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="8">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="8">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -508,12 +498,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="9">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="9">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -522,12 +508,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="10">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="10">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -536,12 +518,8 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="11">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="11">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -550,12 +528,28 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
-                                    <StackPane layoutX="10.0" layoutY="10.0" GridPane.columnIndex="12">
+                                    <StackPane layoutX="10.0" layoutY="10.0" styleClass="barreDeVie" GridPane.columnIndex="12">
+                                       <children>
+                                          <FlowPane />
+                                          <Label alignment="CENTER" text="0" textFill="WHITE">
+                                             <font>
+                                                <Font size="36.0" />
+                                             </font>
+                                          </Label>
+                                       </children>
+                                    </StackPane>
+                                    <StackPane styleClass="barreDeVie" GridPane.columnIndex="13">
+                                       <children>
+                                          <FlowPane />
+                                          <Label alignment="CENTER" text="0" textFill="WHITE">
+                                             <font>
+                                                <Font size="36.0" />
+                                             </font>
+                                          </Label>
+                                       </children>
+                                    </StackPane>
+                                    <StackPane styleClass="barreDeVie" GridPane.columnIndex="14">
                                        <children>
                                           <FlowPane />
                                           <Label alignment="CENTER" text="0" textFill="WHITE">
@@ -564,10 +558,6 @@
                                              </font>
                                           </Label>
                                        </children>
-                                       <styleClass>
-                                          <String fx:value="barreDeVie" />
-                                          <String fx:value="zero" />
-                                       </styleClass>
                                     </StackPane>
                                  </children>
                               </GridPane>
diff --git a/src/ihm/ressources/style/plateau.css b/src/ihm/ressources/style/plateau.css
index 2ab3e3e..c82f2a3 100644
--- a/src/ihm/ressources/style/plateau.css
+++ b/src/ihm/ressources/style/plateau.css
@@ -50,6 +50,11 @@
     -fx-background-insets: 0 0 0 0, 0, 1, 2;
 }
 
+.boutonPause {
+	-fx-border-width: 0;
+	-fx-background-color: none;
+}
+
 .carteLumiere {
 	-fx-background-color: #edebea;
 	-fx-border-color: #cecece;