Merge branch 'master' of https://eng-git.canterbury.ac.nz/fwy13/SENG202

2016-09-15 16:54:24 +12:00
parent 33aafeb510 ddcb3f65a7
commit 0189cfbe1c
4 changed files with 5 additions and 3 deletions
@@ -14,6 +14,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>

 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng202.group9.GUI.FlightSummaryController">
   <children>
@@ -63,6 +64,7 @@
                              </Pane>
                              <Pane prefHeight="934.0" prefWidth="474.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
                                 <children>
+                                    <WebView prefHeight="431.0" prefWidth="310.0" />
                                    <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d93e0" height="432.0" layoutX="5.0" layoutY="-1.0" smooth="false" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" width="305.0" />
                                 </children>
                                 <padding>