michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged dev changes back on to mini map

Browse Source 
#story[1273]
This commit is contained in:
William Muir
2017-09-28 12:58:19 +13:00
parent 076c4c9a40
commit b9a2d60115
3 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/RaceViewController.java
+1
View File
@@ -191,6 +191,7 @@ public class RaceViewController extends Thread {
raceData.getMarkSequence(), raceData.getCourseLimit(), raceData.getMarkSequence(), raceData.getCourseLimit(),
new ArrayList<>(participants.values()), player new ArrayList<>(participants.values()), player
); );
miniMapButton.setOnMouseClicked((event) -> { miniMapButton.setOnMouseClicked((event) -> {
if (miniMapPane.visibleProperty().get()) { if (miniMapPane.visibleProperty().get()) {
miniMapPane.setVisible(false); miniMapPane.setVisible(false);
src/main/java/seng302/visualiser/controllers/ViewManager.java
+2
View File
@@ -404,7 +404,9 @@ public class ViewManager {
.add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm()); .add(getClass().getResource("/css/dialogs/Snackbar.css").toExternalForm());
JFXSnackbar bar = new JFXSnackbar(decorator); JFXSnackbar bar = new JFXSnackbar(decorator);
Platform.runLater(() -> {
bar.enqueue(new JFXSnackbar.SnackbarEvent(msg)); bar.enqueue(new JFXSnackbar.SnackbarEvent(msg));
});
} }
public Stage getStage() { public Stage getStage() {
src/main/resources/views/dialogs/TokenInfoDialog.fxml
+78
View File
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.text.*?>
<?import com.jfoenix.controls.*?>
<?import java.lang.*?>
<?import java.net.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXDialogLayout?>
<?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
minWidth="-Infinity" prefHeight="273.0" prefWidth="436.0" xmlns="http://javafx.com/javafx/8"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="seng302.visualiser.controllers.dialogs.TokenInfoDialogController">
<children>
<GridPane>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308"/>
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="40.0" minHeight="30.0" prefHeight="40.0"
vgrow="SOMETIMES"/>
<RowConstraints maxHeight="1.7976931348623157E308" minHeight="80.0"
prefHeight="115.0" vgrow="SOMETIMES"/>
<RowConstraints maxHeight="141.0" minHeight="34.0" prefHeight="73.0"
vgrow="SOMETIMES"/>
</rowConstraints>
<children>
<JFXButton fx:id="optionButton" buttonType="RAISED" prefHeight="55.0"
prefWidth="150.0" text="Ok" GridPane.halignment="CENTER" GridPane.rowIndex="2"
GridPane.valignment="CENTER">
<GridPane.margin>
<Insets/>
</GridPane.margin>
</JFXButton>
<Label fx:id="headerLabel" text="Popup header" GridPane.halignment="CENTER">
<font>
<Font size="15.0"/>
</font>
</Label>
<GridPane GridPane.rowIndex="1">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="270.0" minWidth="10.0"
prefWidth="270.0"/>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="225.0" minWidth="-Infinity"
prefWidth="138.0"/>
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="100.0" vgrow="SOMETIMES"/>
</rowConstraints>
<children>
<Pane fx:id="tokenPane" prefHeight="200.0" prefWidth="200.0"
GridPane.columnIndex="1"/>
<TextArea fx:id="contentText" nodeOrientation="RIGHT_TO_LEFT"
prefHeight="200.0" prefWidth="200.0" promptText="This is some text"
stylesheets="@../../css/TokenInfoDialog.css" wrapText="true">
<font>
<Font size="16.0"/>
</font>
</TextArea>
</children>
</GridPane>
</children>
</GridPane>
</children>
<stylesheets>
<URL value="@../../css/dialogs/Popup.css"/>
<URL value="@../../css/Master.css"/>
</stylesheets>
</JFXDialogLayout>