mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 14:28:43 +00:00
Fixed some UI bugs, and redesigned some UI elements.
- Changed class structure (added dialogs, cells folder) - Changed font to Baloo as it has better font height - Figured out a way to change the font color of max player slider thumb - Added cursor effect when mouse hover on any button - Fixed drop shadow bug for lobby view player cell - Moved drop shadow effect from player cell controller to css #story[1245]
This commit is contained in:
Haoming Yin
@@ -33,7 +33,8 @@
|
||||
</GridPane>
|
||||
<GridPane>
|
||||
<children>
|
||||
<Label text="Party Parrots In Space" GridPane.valignment="CENTER" fx:id="serverName">
|
||||
<Label fx:id="serverName" text="Party Parrots In Space"
|
||||
GridPane.valignment="CENTER">
|
||||
<font>
|
||||
<Font size="31.0" />
|
||||
</font>
|
||||
@@ -41,7 +42,8 @@
|
||||
<Insets left="35.0" top="10.0" />
|
||||
</padding>
|
||||
</Label>
|
||||
<Label text="This is a map, it's called Haoming" GridPane.rowIndex="1" fx:id="mapName">
|
||||
<Label fx:id="mapName" text="This is a map, it's called Haoming"
|
||||
GridPane.rowIndex="1">
|
||||
<padding>
|
||||
<Insets left="35.0" top="-15.0" />
|
||||
</padding>
|
||||
@@ -67,7 +69,7 @@
|
||||
<children>
|
||||
<ScrollPane fx:id="playerListScrollPane" hbarPolicy="NEVER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
|
||||
<content>
|
||||
<VBox fx:id="playerListVBox" fillWidth="false" prefHeight="200.0" prefWidth="100.0" />
|
||||
<VBox fx:id="playerListVBox" prefHeight="200.0" prefWidth="100.0"/>
|
||||
</content>
|
||||
<GridPane.margin>
|
||||
<Insets bottom="15.0" left="7.0" right="15.0" top="15.0" />
|
||||
|
||||
@@ -7,15 +7,19 @@
|
||||
<?import javafx.scene.layout.*?>
|
||||
<?import javafx.scene.text.*?>
|
||||
|
||||
<VBox fx:id="playerCellVBox" fillWidth="false" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="80.0" prefWidth="330.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<VBox fx:id="playerCellVBox" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
|
||||
minHeight="-Infinity" minWidth="-Infinity" prefHeight="80.0" xmlns="http://javafx.com/javafx/8"
|
||||
xmlns:fx="http://javafx.com/fxml/1">
|
||||
<stylesheets>
|
||||
<String fx:value="/css/master.css" />
|
||||
<String fx:value="/css/PlayerCell.css" />
|
||||
<String fx:value="/css/cells/PlayerCell.css"/>
|
||||
</stylesheets>
|
||||
<children>
|
||||
<GridPane fx:id="playerListCell" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" prefHeight="70.0">
|
||||
<GridPane fx:id="playerListCell" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
|
||||
minHeight="-Infinity" prefHeight="70.0">
|
||||
<columnConstraints>
|
||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="380.0" prefWidth="380.0" />
|
||||
<ColumnConstraints hgrow="SOMETIMES" maxWidth="355.0" minWidth="355.0"
|
||||
prefWidth="355.0"/>
|
||||
</columnConstraints>
|
||||
<rowConstraints>
|
||||
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
||||
@@ -26,6 +30,9 @@
|
||||
<Insets left="20.0" />
|
||||
</padding></Label>
|
||||
</children>
|
||||
<VBox.margin>
|
||||
<Insets right="40.0"/>
|
||||
</VBox.margin>
|
||||
</GridPane>
|
||||
</children>
|
||||
<padding>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<VBox fx:id="serverCellVBox" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="95.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<stylesheets>
|
||||
<String fx:value="/css/master.css" />
|
||||
<String fx:value="/css/ServerCell.css" />
|
||||
<String fx:value="/css/cells/ServerCell.css"/>
|
||||
</stylesheets>
|
||||
<children>
|
||||
<GridPane fx:id="serverListCell" prefHeight="80.0">
|
||||
|
||||
@@ -9,7 +9,10 @@
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="400.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.BoatCustomizeController">
|
||||
<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
|
||||
minWidth="-Infinity" prefWidth="400.0" xmlns="http://javafx.com/javafx/8"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
fx:controller="seng302.visualiser.controllers.dialogs.BoatCustomizeController">
|
||||
<children>
|
||||
<GridPane>
|
||||
<columnConstraints>
|
||||
@@ -56,7 +59,7 @@
|
||||
</GridPane>
|
||||
</children>
|
||||
<stylesheets>
|
||||
<String fx:value="/css/ServerCreation.css" />
|
||||
<String fx:value="/css/dialogs/ServerCreation.css"/>
|
||||
<String fx:value="/css/master.css" />
|
||||
</stylesheets>
|
||||
</JFXDialogLayout>
|
||||
|
||||
@@ -9,7 +9,10 @@
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="550.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.ServerCreationController">
|
||||
<JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
|
||||
minWidth="-Infinity" prefWidth="550.0" xmlns="http://javafx.com/javafx/8"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
fx:controller="seng302.visualiser.controllers.dialogs.ServerCreationController">
|
||||
<children>
|
||||
<GridPane>
|
||||
<columnConstraints>
|
||||
@@ -18,47 +21,59 @@
|
||||
<rowConstraints>
|
||||
<RowConstraints maxHeight="90.0" minHeight="90.0" prefHeight="90.0" vgrow="SOMETIMES" />
|
||||
<RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0" vgrow="SOMETIMES" />
|
||||
<RowConstraints maxHeight="125.0" minHeight="125.0" prefHeight="125.0" vgrow="SOMETIMES" />
|
||||
<RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0"
|
||||
vgrow="SOMETIMES"/>
|
||||
<RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0" vgrow="SOMETIMES" />
|
||||
</rowConstraints>
|
||||
<children>
|
||||
<Label fx:id="hostDialogHeader" text="Host a game..." GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
|
||||
<JFXButton fx:id="submitBtn" prefHeight="45.0" prefWidth="220.0" text="Submit" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
|
||||
<JFXTextField fx:id="serverName" promptText="Server Name" GridPane.rowIndex="1">
|
||||
<Label fx:id="hostDialogHeader" text="HOST A GAME SERVER"
|
||||
GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
|
||||
<JFXButton fx:id="submitBtn" prefHeight="55.0" prefWidth="250.0" text="SUBMIT"
|
||||
GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER"/>
|
||||
<JFXTextField fx:id="serverName" promptText="SERVER NAME" GridPane.rowIndex="1">
|
||||
<GridPane.margin>
|
||||
<Insets left="30.0" right="30.0" />
|
||||
</GridPane.margin></JFXTextField>
|
||||
<GridPane GridPane.rowIndex="2">
|
||||
<GridPane fx:id="maxPlayersGridPane" GridPane.rowIndex="2">
|
||||
<columnConstraints>
|
||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="30.0" prefWidth="100.0" />
|
||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0"/>
|
||||
</columnConstraints>
|
||||
<rowConstraints>
|
||||
<RowConstraints minHeight="10.0" percentHeight="60.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
||||
<RowConstraints minHeight="10.0" percentHeight="60.0" prefHeight="10.0"
|
||||
vgrow="SOMETIMES"/>
|
||||
<RowConstraints minHeight="10.0" percentHeight="40.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
||||
</rowConstraints>
|
||||
<children>
|
||||
<JFXSlider fx:id="maxPlayers" max="20.0" min="2.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
|
||||
<GridPane.margin>
|
||||
<Insets left="10.0" right="30.0" top="20.0" />
|
||||
</GridPane.margin>
|
||||
</JFXSlider>
|
||||
<Label fx:id="maxPlayersLabel" text="20" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">
|
||||
<GridPane.margin>
|
||||
<Insets right="30.0" />
|
||||
</GridPane.margin></Label>
|
||||
<Label text="Max Player Count" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
|
||||
<Label fx:id="maxPlayerPromptLabel" text="MAX PLAYERS" GridPane.halignment="LEFT"
|
||||
GridPane.valignment="BOTTOM">
|
||||
<GridPane.margin>
|
||||
<Insets left="25.0" top="20.0" />
|
||||
<Insets left="30.0" top="20.0"/>
|
||||
</GridPane.margin>
|
||||
</Label>
|
||||
<VBox alignment="BOTTOM_CENTER" prefHeight="200.0" prefWidth="100.0"
|
||||
GridPane.columnIndex="1" GridPane.halignment="CENTER"
|
||||
GridPane.valignment="CENTER">
|
||||
<children>
|
||||
<JFXSlider fx:id="maxPlayersSlider" blockIncrement="1.0"
|
||||
majorTickUnit="2.0" max="20.0" min="1.0" minorTickCount="1"
|
||||
snapToTicks="true" styleClass="maxPlayers" value="11.0"/>
|
||||
</children>
|
||||
<GridPane.margin>
|
||||
<Insets bottom="10.0" right="30.0"/>
|
||||
</GridPane.margin>
|
||||
</VBox>
|
||||
</children>
|
||||
</GridPane>
|
||||
</children>
|
||||
</GridPane>
|
||||
</children>
|
||||
<stylesheets>
|
||||
<String fx:value="/css/ServerCreation.css" />
|
||||
<String fx:value="/css/dialogs/ServerCreation.css"/>
|
||||
<String fx:value="/css/master.css" />
|
||||
</stylesheets>
|
||||
</JFXDialogLayout>
|
||||
|
||||
Reference in New Issue
Block a user