"Fix" with overlapping text

This commit is contained in:
maj83 2020-04-30 22:09:51 +01:00
parent acaeac8f86
commit 277278377f

View file

@ -16,7 +16,7 @@
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<BorderPane fx:id="container" minHeight="550" minWidth="450" xmlns="http://javafx.com/javafx/8.0.17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs221.group20.javafx.MatchTheMeaningController"> <BorderPane fx:id="container" minHeight="550" minWidth="450" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs221.group20.javafx.MatchTheMeaningController">
<left> <left>
@ -123,7 +123,7 @@
<children> <children>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0">
<Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" onAction="#checkAnswers" text="Confirm" /> <Button fx:id="ConfirmButton" layoutX="271.0" layoutY="321.0" mnemonicParsing="false" onAction="#checkAnswers" text="Confirm" />
<ComboBox fx:id="word1" layoutX="448.0" layoutY="118.0" prefHeight="25.0" prefWidth="58.0" value="1"> <ComboBox fx:id="word1" layoutX="493.0" layoutY="124.0" prefHeight="25.0" prefWidth="33.0" value="1">
<items> <items>
<FXCollections fx:factory="observableArrayList"> <FXCollections fx:factory="observableArrayList">
<String fx:value="1" /> <String fx:value="1" />
@ -133,7 +133,7 @@
</FXCollections> </FXCollections>
</items> </items>
</ComboBox> </ComboBox>
<ComboBox fx:id="word2" layoutX="448.0" layoutY="153.0" prefHeight="25.0" prefWidth="58.0" value="1"> <ComboBox fx:id="word2" layoutX="492.0" layoutY="159.0" prefHeight="25.0" prefWidth="51.0" value="1">
<items> <items>
<FXCollections fx:factory="observableArrayList"> <FXCollections fx:factory="observableArrayList">
<String fx:value="1" /> <String fx:value="1" />
@ -143,7 +143,7 @@
</FXCollections> </FXCollections>
</items> </items>
</ComboBox> </ComboBox>
<ComboBox fx:id="word3" layoutX="448.0" layoutY="188.0" prefHeight="25.0" prefWidth="58.0" value="1"> <ComboBox fx:id="word3" layoutX="492.0" layoutY="194.0" prefHeight="25.0" prefWidth="51.0" value="1">
<items> <items>
<FXCollections fx:factory="observableArrayList"> <FXCollections fx:factory="observableArrayList">
<String fx:value="1" /> <String fx:value="1" />
@ -153,7 +153,7 @@
</FXCollections> </FXCollections>
</items> </items>
</ComboBox> </ComboBox>
<ComboBox fx:id="word4" layoutX="448.0" layoutY="223.0" prefHeight="25.0" prefWidth="58.0" value="1"> <ComboBox fx:id="word4" layoutX="492.0" layoutY="229.0" prefHeight="25.0" prefWidth="51.0" value="1">
<items> <items>
<FXCollections fx:factory="observableArrayList"> <FXCollections fx:factory="observableArrayList">
<String fx:value="1" /> <String fx:value="1" />
@ -163,53 +163,53 @@
</FXCollections> </FXCollections>
</items> </items>
</ComboBox> </ComboBox>
<Label fx:id="RightWord1" layoutX="319.0" layoutY="122.0" text="Welsh word#3"> <Label fx:id="RightWord1" layoutX="319.0" layoutY="126.0" text="Welsh word#3" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font> </font>
</Label> </Label>
<Label fx:id="RightWord2" layoutX="319.0" layoutY="157.0" text="Welsh word#2"> <Label fx:id="RightWord2" layoutX="319.0" layoutY="161.0" text="Welsh word#2" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font> </font>
</Label> </Label>
<Label fx:id="RightWord3" layoutX="319.0" layoutY="192.0" text="Welsh word#1"> <Label fx:id="RightWord3" layoutX="319.0" layoutY="196.0" text="Welsh word#1" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label fx:id="RightWord4" layoutX="319.0" layoutY="227.0" text="Welsh word#4"> <Label fx:id="RightWord4" layoutX="319.0" layoutY="231.0" text="Welsh word#4" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label fx:id="LeftWord1" layoutX="122.0" layoutY="122.0" text="English Word #1"> <Label fx:id="LeftWord1" layoutX="104.0" layoutY="126.0" text="English Word #1" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label fx:id="LeftWord2" layoutX="122.0" layoutY="157.0" text="English Word #2"> <Label fx:id="LeftWord2" layoutX="104.0" layoutY="161.0" text="English Word #2" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label fx:id="LeftWord3" layoutX="122.0" layoutY="192.0" text="English Word #3"> <Label fx:id="LeftWord3" layoutX="104.0" layoutY="196.0" text="English Word #3" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label fx:id="LeftWord4" layoutX="122.0" layoutY="227.0" text="English Word #4"> <Label fx:id="LeftWord4" layoutX="104.0" layoutY="231.0" text="English Word #4" wrapText="true">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label layoutX="105.0" layoutY="122.0" text="1."> <Label layoutX="87.0" layoutY="126.0" text="1.">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label layoutX="105.0" layoutY="157.0" text="2."> <Label layoutX="87.0" layoutY="161.0" text="2.">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label layoutX="105.0" layoutY="192.0" text="3."> <Label layoutX="87.0" layoutY="196.0" text="3.">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
<Label layoutX="105.0" layoutY="227.0" text="4."> <Label layoutX="87.0" layoutY="231.0" text="4.">
<font> <font>
<Font size="14.0" /> <Font size="14.0" />
</font></Label> </font></Label>
@ -218,7 +218,7 @@
<Font size="17.0" /> <Font size="17.0" />
</font> </font>
</Label> </Label>
<Label layoutX="328.0" layoutY="53.0" text="Incorrect answers:"> <Label layoutX="350.0" layoutY="53.0" text="Total answers:">
<font> <font>
<Font size="17.0" /> <Font size="17.0" />
</font> </font>