From 562d641703107e47d80d8ffc84d57c19c84b5b5a Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Mon, 25 Sep 2017 20:19:21 +1300
Subject: [PATCH] Fixed alignment on room code label, and room code input

Tags: #story[1281]
---
 .../visualiser/controllers/LobbyController.java     |  2 +-
 src/main/resources/views/LobbyView.fxml             | 13 +++++++++++--
 src/main/resources/views/ServerListView.fxml        |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index a3cf0bfb..b6dd57a6 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -246,6 +246,6 @@ public class LobbyController implements Initializable {
     }
 
     public void setRoomCode(String roomCode) {
-        serverName.setText(serverName.getText() + " ( " + roomCode +" )");
+        roomLabel.setText("Room#" + roomCode);
     }
 }
diff --git a/src/main/resources/views/LobbyView.fxml b/src/main/resources/views/LobbyView.fxml
index 81f3f1f9..08df8ee7 100644
--- a/src/main/resources/views/LobbyView.fxml
+++ b/src/main/resources/views/LobbyView.fxml
@@ -52,10 +52,19 @@
                                 <Insets left="35.0" top="-15.0" />
                             </padding>
                         </Label>
+                  <Label fx:id="roomLabel" text="Room: 2145" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
+                     <font>
+                        <Font size="31.0" />
+                     </font>
+                     <GridPane.margin>
+                        <Insets right="20.0" top="10.0" />
+                     </GridPane.margin>
+                  </Label>
                     </children>
                     <columnConstraints>
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="732.0" minWidth="10.0" prefWidth="507.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="10000.0" minWidth="10.0" prefWidth="155.0" />
+                  <ColumnConstraints halignment="RIGHT" hgrow="NEVER" maxWidth="445.0" minWidth="10.0" prefWidth="238.0" />
                     </columnConstraints>
                     <rowConstraints>
                         <RowConstraints maxHeight="1.7976931348623157E308" minHeight="50.0" prefHeight="74.0" vgrow="SOMETIMES" />
diff --git a/src/main/resources/views/ServerListView.fxml b/src/main/resources/views/ServerListView.fxml
index 4a9493b5..e75adbe9 100644
--- a/src/main/resources/views/ServerListView.fxml
+++ b/src/main/resources/views/ServerListView.fxml
@@ -116,8 +116,8 @@
             </columnConstraints>
             <rowConstraints>
                 <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="1.7976931348623157E308" minHeight="400.0" prefHeight="400.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="80.0" minHeight="125.0" prefHeight="80.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="1.7976931348623157E308" minHeight="400.0" prefHeight="465.0" vgrow="SOMETIMES" />
+                <RowConstraints maxHeight="70.0" minHeight="70.0" prefHeight="70.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <stylesheets>
                 <String fx:value="/css/Master.css" />