Skip to content
GitLab
Commit 614fd879 authored by Peining's avatar Peining
Browse files

fixbug profile statstics

parent 75873824
Hide whitespace changes
Inline Side-by-side
Battleship/src/main/resources/fxml/ihmmain/PlayerProfile.fxml
View file @ 614fd879
......@@ -132,47 +132,21 @@
</Label>
<GridPane fx:id="stat" prefHeight="125.0" prefWidth="368.0" GridPane.halignment="RIGHT" GridPane.rowIndex="1" GridPane.valignment="CENTER">
<children>
<<<<<<< HEAD
<Label text="Total" GridPane.rowIndex="1">
<GridPane.margin>
<Insets left="10.0" />
</GridPane.margin>
</Label>
<Label text="Classical Mode" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="10.0" />
</GridPane.margin>
</Label>
<Label text="Belge Mode" GridPane.rowIndex="3">
<GridPane.margin>
<Insets left="10.0" />
</GridPane.margin>
</Label>
=======
<Label GridPane.columnIndex="1" />
<Label text="Classical" GridPane.rowIndex="1" />
<Label text="Belgian" GridPane.rowIndex="2" />
<Label text="Total" GridPane.rowIndex="3" />
>>>>>>> develop
<Label text="Win" GridPane.columnIndex="1" />
<Label text="Loss" GridPane.columnIndex="2" />
<Label text="Abandoned" GridPane.columnIndex="3" />
<Label text="Played" GridPane.columnIndex="4" />
</children>
<columnConstraints>
<<<<<<< HEAD
<ColumnConstraints hgrow="SOMETIMES" maxWidth="122.0" minWidth="10.0" prefWidth="118.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="85.50106811523438" minWidth="10.0" prefWidth="33.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="103.73809814453125" minWidth="10.0" prefWidth="37.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="99.23699951171875" minWidth="10.0" prefWidth="78.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="108.71102905273438" minWidth="10.0" prefWidth="54.0" />
=======
<ColumnConstraints hgrow="SOMETIMES" maxWidth="121.50106811523438" minWidth="10.0" prefWidth="106.39501953125" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="85.50106811523438" minWidth="10.0" prefWidth="43.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="103.73809814453125" minWidth="10.0" prefWidth="40.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="99.23699951171875" minWidth="10.0" prefWidth="81.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="108.71102905273438" minWidth="10.0" prefWidth="56.0" />
>>>>>>> develop
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment