From 2dd4182799cd53dc3b034f7fee86c0994084f548 Mon Sep 17 00:00:00 2001
From: Fan-Wu Yang <fwy13@uclive.ac.nz>
Date: Wed, 5 Apr 2017 13:16:52 +1200
Subject: [PATCH] Fixed scene resizing when a new page happens to load.

---
 src/main/java/controllers/Main.java    |  20 +++++++++---
 src/main/resources/scenes/addride.fxml |  42 ++++++++++++-------------
 target/classes/controllers/Main.class  | Bin 2848 -> 3031 bytes
 target/classes/scenes/addride.fxml     |  42 ++++++++++++-------------
 4 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/src/main/java/controllers/Main.java b/src/main/java/controllers/Main.java
index a9bb73f..9e77951 100644
--- a/src/main/java/controllers/Main.java
+++ b/src/main/java/controllers/Main.java
@@ -19,9 +19,10 @@ import java.io.InputStream;
 public class Main extends Application {
 
     private Stage primaryStage;
-    private Scene base;
+    private Parent base;
     private BaseController baseController;
     private Session session;
+    private Scene scene = null;
 
     public void start(Stage stage) throws Exception {
         this.primaryStage = stage;
@@ -30,7 +31,7 @@ public class Main extends Application {
         //load up base pane
         FXMLLoader loader = new FXMLLoader(getClass().getClassLoader().getResource("scenes/base.fxml"));
         Parent root = loader.load();
-        base = new Scene(root, SceneCode.prefWidth, SceneCode.prefHeight);
+        base = root;
         baseController = (BaseController) loader.getController();
         baseController.setParent(this);
 
@@ -38,6 +39,8 @@ public class Main extends Application {
 
         //set up stage
         stage.setTitle("UC RSS");
+        stage.setMinHeight(400);
+        stage.setMinWidth(600);
         stage.show();
 
     }
@@ -57,12 +60,19 @@ public class Main extends Application {
         } finally {
             in.close();
         }
-        Scene scene = null;
         if (fxml.isLoadMenu()){
-            scene = base;
+            if (scene == null){
+                scene = new Scene(base, SceneCode.prefWidth, SceneCode.prefHeight);
+            }else{
+                scene.setRoot(base);
+            }
             baseController.setContent(page);
         }else {
-            scene = new Scene(page, SceneCode.prefWidth, SceneCode.prefHeight);
+            if (scene == null) {
+                scene = new Scene(page, SceneCode.prefWidth, SceneCode.prefHeight);
+            }else{
+                scene.setRoot(page);
+            }
         }
         primaryStage.setScene(scene);
         Controller controller = loader.getController();
diff --git a/src/main/resources/scenes/addride.fxml b/src/main/resources/scenes/addride.fxml
index b8a6917..12ecb10 100644
--- a/src/main/resources/scenes/addride.fxml
+++ b/src/main/resources/scenes/addride.fxml
@@ -5,7 +5,6 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-
 <AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.AddRideController">
    <children>
       <GridPane layoutX="154.0" layoutY="68.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -16,32 +15,33 @@
           <ColumnConstraints hgrow="SOMETIMES" />
         </columnConstraints>
         <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Label text="Add a Ride" GridPane.columnSpan="4" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+            <Label text="Add a Ride" GridPane.columnSpan="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
                <font>
                   <Font size="18.0" />
                </font>
             </Label>
-            <Label text="Model:" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="1" />
-            <Label text="Colour:" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-            <Label text="License Plate:" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-            <Label text="Year:" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-            <Label text="Number of Seats:" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-            <Button mnemonicParsing="false" onAction="#addRide" prefHeight="25.0" prefWidth="187.0" text="Submit" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.rowIndex="6" />
-            <TextField fx:id="model" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-            <TextField fx:id="colour" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-            <TextField fx:id="license" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-            <TextField fx:id="year" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-            <TextField fx:id="numSeats" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+            <Label text="Model:" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+            <Label text="Colour:" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label text="License Plate:" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+            <Label text="Year:" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+            <Label text="Number of Seats:" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+            <Button mnemonicParsing="false" onAction="#addRide" prefHeight="25.0" prefWidth="187.0" text="Submit" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.rowIndex="7" />
+            <TextField fx:id="model" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+            <TextField fx:id="colour" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+            <TextField fx:id="license" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+            <TextField fx:id="year" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+            <TextField fx:id="numSeats" GridPane.columnIndex="2" GridPane.rowIndex="6" />
          </children>
       </GridPane>
    </children>
diff --git a/target/classes/controllers/Main.class b/target/classes/controllers/Main.class
index 06cd9e51300ed2fcc70f72dc04be60cca05d6036..78f526dd6a7a2ba2f2ceb47c91a8c7dc8db44014 100644
GIT binary patch
delta 1616
zcmZvcTXPgu5XXPB+1ay9P9h|buwb}flG%h6L5N8pQ9w{gjEP)=7YxY)!LUJgh2U)g
zFDRmj;|1`BqQna#31n7*AWu@|7x2aM+42MUM4^3VQ&>>$)^wll(|x-C|I;%k%YG}*
z{(9r$6<{GF4tLQxh6J09=o&*eNk>*&6k8p((c`e4r=#>b>>%Y3q0fk&if2s1E@Pw>
z8Dl)_FqYklJr1S$L;Iubb$E{FBTajyp8SmULNd~H;Ob5DMdN$P9MtJZ`K+n5&zSoi
z4)C(^y`p&4wDy`22OVbfx)E=ff`?4{n~K8@)$BInEydf4BS)_!yc^a;FKn%`?Q~Z%
zb@Z=EUaNJs*jdrvmE4)>=}SrH?|8F9Depw6wp4PC3Tnl>3QzFKk=~!7trhh&Xzry>
zGoQO9M)Mvmnul0zQRe+&m9160ulaxv6~{EkIbku@)Jvuln>*9Vd0YB-^eR5me9R}B
zdOp>B#z~9P?VY<jxAZ51*hFjRu4F2sS-?Wg=bZHZE|{9Vheet%IAu|^qpv&Jn`lp_
z)6%$RF|`(vwaccpwYMw2)O^Kh%>Z9(zA@rk)Ae_p(R|NYQ}71?ra5QagA7@e+)};W
z^s70~1<kM#_4t~i96xG)GU6hayi|B{!DSlG9}e%gyp@sO89JTJH20)dC407R%UFaf
zmshQ`D9n4;_jG5rd4rMjUQwh@DRH*-^?4~ZrO=V}vc6PC@Op>Tf^0&D5Ntw*VOfO?
z34s>;fflrZmTM4gV@ZDvBA19&EAf_S$IW56)-a*LAa<$o$sRI|VPZ7OO6MbK;y$q~
z?q?aHY;er)5)>9^w;La(z#Ss&V_zcD;rb|_Xvr8KCr4p(wU53^QHxtMOtCB09akAU
z%sBUgJU%7vB}zMTj2~t~yrj&hJU*U@K9fXE_Nj>bO!=?DMHG>RI|WmPbT>`@)2U<z
zHOv%bv!v5Gtfq=baM?hdO)}tJ%nQ)C`G!Z)Nb4*Y{wz6TIV*TTuvZF8D}~DfRtdDQ
z>^&%tjIQhnch*^=M5I0=25F9|&7)|g%V|E-TdHe(W(eB4uq<W{pzCb2h}l0&#H{1g
z3+m7{Dg^ZG4p|ouG3VeAa}VaIl$#h3h9tmj_*97+7ZY0D0piAejmai2+Yt-jo~F&d
zi8V<D#_);fxvs9WWA-l;$871fCT9E08x%O@0dWXqR~`hi8Gts%i(D))YbByyVwT8<
zW2r<ekzs2TZxh)@nT8ITgl=JNr|`8$*g7IC9iy33v~Y%p<(+9IC%15!_JI3UC^<~A
zM%XoDGjj75MkK36SdPkzl)r^?PRj|c($ahmk7k@<oSfDs_ug*!uOj-7G!<4ns*n%L
zI>mY{#fIxd6&-V(!YR?~%v5Z=<t88Faj9h9f`n*Gv@KjsI46rxfIkvA*99%-hu<D;
Z)Zz)A43Zme%`Uh-d*lCRZwhKW^)GdYC0zgj

delta 1444
zcmZva*;8Cq5XOIZm^){<958?kOo$0&F*pN^AkjEkPzlBb5W%RRMhFa%2m>;hpfOGo
zjJU)lUX8{zuDGTI;ZkL)VydjlgD<{l`49LH_)e*PW+;&=>elVk=bW$m^!IiDQF=a<
z{^jo<F98i)aHyg?m#sXM%fme4h__$ys6!9E4hQH9((jO9z`^FAF^?$*6^9J`abt!Y
z@)<TMlID6uF={qXI21FcNI8VEFN_Cy(%~>ioJO$|2HfpPf~QRWr_J`L!!sN+XV04G
zv_T(NoN(C8m@y|6lZxlg{26o8R;e4cTHLeN1-IBLD{z`8`Vyn#gCoh5;*{IrO9t#z
zUm}@sFZtpjiF#gWDW()JWC=)KH!tU4Ngef?>xc+K^CHcfTe;0Wol~BEN%JzN6|ZPs
z<u!{nnS80(f!<W2c3@(7Nb$Pn3~y-aa5Zo8mPPTQ-ow2E6R`|7*4{goNRC?+tvKy8
zb!pD>w&opU>Nux~QmuK{<XGD`k{lm%o2-)kni^^~@A1Ax{_seDVkp*`NTr0PCdTy^
zfqhLC9i5$u4>TY0k><SN^D&=jKIJo0)aSxl^MyH{=1a|2e69J0Z!JRZufCA2`HuP@
ze)gZR+*2y<?g<RJzXfI-CzTj)k~$Je_ljEY{-x^DTV+_lkI(2Op3l^rS*6I#DkaHk
zV+o~tu{X#rCaYymBMVqF8CZkZK<2QRZQ|=JfE&3<b{5;YS(2OJ-wDctkcdR*)A%B@
z<aqcmVs}M60v@U;=#jgC(^~D3cNyIlxk!Fj%`62|vs^W`z?yjqBXU`Enc{h_j?BsL
zQ6jKV*8-*Ultqie9&4i><;&I8k|(d03zc<J-3BV;OIK0JPByZaP29s4x<!v3(V|~;
zFf=0BQkQ5*(ZuD<lF(*$NTg5jyX4zV4vm8M%iS&V%fMynTH`4BVA3#LU|s7HODXOe
zFU|V4>Kcy?LNo3cr(#+h+c;tSCo66Xs`8vro1-vp8=_&q$Hr+wMv}1qf0|^jePP>U
zQ&yVI@jy6mg@SNEUfdEEWv`u)no5PS>3Nm#sB%XgJ8fEbJB4B!q&3?Fv0X56QDcXo
z;?nn>a<fZzyM<RHtzvs<Vvs$Ii4I33`j{wqk~=e+bx4*<;oKy6)9A_n)SHxuW>F`|
z(Ixdt8A?m|UXibkj-`+WX~i8fhPI?Hl%#jbWZf-^qS*gPMSew#qE*qR1ZXMR7YQov
zU8G#mQM5><qH{$z?qi?4x^i;oDEnS=`siOC-Ii5H_kJE&CEAybUJh<wHTc2I8(seb
DVe#}C

diff --git a/target/classes/scenes/addride.fxml b/target/classes/scenes/addride.fxml
index b8a6917..12ecb10 100644
--- a/target/classes/scenes/addride.fxml
+++ b/target/classes/scenes/addride.fxml
@@ -5,7 +5,6 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-
 <AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="controllers.AddRideController">
    <children>
       <GridPane layoutX="154.0" layoutY="68.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -16,32 +15,33 @@
           <ColumnConstraints hgrow="SOMETIMES" />
         </columnConstraints>
         <rowConstraints>
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-          <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            <RowConstraints vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="10.0" prefHeight="40.0" vgrow="SOMETIMES" />
+          <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="40.0" minHeight="40.0" prefHeight="40.0" vgrow="SOMETIMES" />
+            <RowConstraints vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <Label text="Add a Ride" GridPane.columnSpan="4" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+            <Label text="Add a Ride" GridPane.columnSpan="4" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
                <font>
                   <Font size="18.0" />
                </font>
             </Label>
-            <Label text="Model:" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="1" />
-            <Label text="Colour:" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-            <Label text="License Plate:" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-            <Label text="Year:" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-            <Label text="Number of Seats:" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-            <Button mnemonicParsing="false" onAction="#addRide" prefHeight="25.0" prefWidth="187.0" text="Submit" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.rowIndex="6" />
-            <TextField fx:id="model" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-            <TextField fx:id="colour" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-            <TextField fx:id="license" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-            <TextField fx:id="year" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-            <TextField fx:id="numSeats" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+            <Label text="Model:" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+            <Label text="Colour:" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+            <Label text="License Plate:" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+            <Label text="Year:" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+            <Label text="Number of Seats:" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+            <Button mnemonicParsing="false" onAction="#addRide" prefHeight="25.0" prefWidth="187.0" text="Submit" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.hgrow="ALWAYS" GridPane.rowIndex="7" />
+            <TextField fx:id="model" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+            <TextField fx:id="colour" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+            <TextField fx:id="license" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+            <TextField fx:id="year" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+            <TextField fx:id="numSeats" GridPane.columnIndex="2" GridPane.rowIndex="6" />
          </children>
       </GridPane>
    </children>