fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated host to show the hosted address and port. Fixed css issue with lobby text field.

Browse Source 
#story[1087]
This commit is contained in:
David Wu
2017-07-27 13:12:39 +12:00
parent f4eb03e79e
commit 2b8b334486
6 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/resources/css/dayMode.css
+1 -1
View File
@@ -28,7 +28,7 @@
/* Fix derived prompt color for text fields */
.text-input {
-fx-prompt-text-fill: derive(-fx-control-inner-background, +0%);
-fx-background-color: #a9a9a9 , black , black;
-fx-background-color: #a9a9a9, black, grey;
}
/* Keep prompt invisible when focused (above color fix overrides it) */
racevisionGame/src/main/resources/css/nightMode.css
+1 -1
View File
@@ -28,7 +28,7 @@
/* Fix derived prompt color for text fields */
.text-input {
-fx-prompt-text-fill: derive(-fx-control-inner-background, +0%);
-fx-background-color: #a9a9a9 , white , white;
-fx-background-color: #a9a9a9 , grey, grey;
}
racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
+11 -3
View File
@@ -21,13 +21,21 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<TextField fx:id="gameNameField" disable="true" promptText="Enter game name" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="TOP" />
<TextField fx:id="hostNameField" disable="true" promptText="Enter host name" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="BOTTOM" />
<Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Host Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
<Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
<font>
<Font size="20.0" />
</font>
</Button>
<Label text="Address: 127.0.0.1" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">
<font>
<Font size="17.0" />
</font>
</Label>
<Label text="Port: 4942" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1">
<font>
<Font size="17.0" />
</font>
</Label>
</children>
</GridPane>
</children>
racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+16 -6
View File
@@ -35,11 +35,6 @@
<Font size="36.0" />
</font>
</Label>
<TextField fx:id="playerNameField" prefHeight="25.0" prefWidth="315.0" promptText="Enter player name" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="50.0" />
</GridPane.margin>
</TextField>
<Button fx:id="joinGameBtn" mnemonicParsing="false" onAction="#connectSocket" text="Connect to Game" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
<GridPane.margin>
<Insets right="50.0" />
@@ -47,7 +42,22 @@
</Button>
<Button mnemonicParsing="false" onAction="#refreshBtnPressed" text="Refresh" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="80.0" />
<Insets left="120.0" />
</GridPane.margin>
</Button>
<TextField fx:id="addressFld" promptText="Address" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="50.0" right="150.0" />
</GridPane.margin>
</TextField>
<TextField fx:id="portFld" promptText="Port Number" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="270.0" />
</GridPane.margin>
</TextField>
<Button mnemonicParsing="false" onAction="#addConnectionPressed" text="Add" GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin>
<Insets left="40.0" />
</GridPane.margin>
</Button>
</children>