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

Added close button for keyBindingDialog.

Browse Source 
- fixed that you cannot bind the key you are using.

#story[1278] #pair[hyi25, zyt10]
This commit is contained in:
Zhi You Tan
2017-09-25 16:31:28 +13:00
parent 19db6668da
commit 191b818e38
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/controllers/ViewManager.java
+18 -10
View File
@@ -39,6 +39,7 @@ public class ViewManager {
private Logger logger = LoggerFactory.getLogger(ViewManager.class);
private Stage stage;
private JFXSnackbar jfxSnackbar;
private JFXDialog keyBindingDialog;
private ViewManager() {
properties = new HashMap<>();
@@ -123,13 +124,14 @@ public class ViewManager {
HBox btns = (HBox) decorator.getChildren().get(0);
//Create settings button -- [WIP]
JFXButton btnSettings = new JFXButton();
btnSettings.setText(" Key Bindings");
btnSettings.setStyle("-fx-text-fill:#fff");
btnSettings.getStyleClass().add("jfx-decorator-button");
btnSettings.setCursor(Cursor.HAND);
JFXButton btnKeyBinding = new JFXButton();
btnKeyBinding.setText(" Key Bindings");
btnKeyBinding.setStyle("-fx-text-fill:#fff");
btnKeyBinding.getStyleClass().add("jfx-decorator-button");
btnKeyBinding.setCursor(Cursor.HAND);
btnKeyBinding.setFocusTraversable(false);
btnSettings.setOnMouseClicked(event -> Platform.runLater(() -> {
btnKeyBinding.setOnMouseClicked(event -> Platform.runLater(() -> {
try {
if (!checkDialogOpened(decorator.getChildren())) {
showKeyBindingDialog();
@@ -145,6 +147,7 @@ public class ViewManager {
btnMute.setStyle("-fx-text-fill:#fff");
btnMute.getStyleClass().add("jfx-decorator-button");
btnMute.setCursor(Cursor.HAND);
btnMute.setFocusTraversable(false);
//Create Graphics
SVGGlyph spacer = new SVGGlyph(0, "SPACER", "", Color.WHITE);
@@ -169,12 +172,12 @@ public class ViewManager {
btnMute.setGraphic(volumeOn);
}
btnSettings.setGraphic(keyBindingGlyph);
btnKeyBinding.setGraphic(keyBindingGlyph);
// Add Buttons
btns.getChildren().add(0, spacer);
btns.getChildren().add(0, btnMute);
btns.getChildren().add(0, btnSettings);
btns.getChildren().add(0, btnKeyBinding);
btnMute.setOnAction((action) -> {
Sounds.toggleAllSounds();
if (btnMute.getGraphic().equals(volumeOff)) {
@@ -209,18 +212,23 @@ public class ViewManager {
"/views/dialogs/KeyBindingDialog.fxml"));
for (Node node : decorator.getChildren()) {
if (node instanceof StackPane) {
JFXDialog dialog = new JFXDialog((StackPane) node,
keyBindingDialog = new JFXDialog((StackPane) node,
dialogContent.load(),
DialogTransition.CENTER);
KeyBindingDialogController keyBindingDialogController = dialogContent
.getController();
keyBindingDialogController.setGameClient(this.gameClient);
dialog.show();
keyBindingDialog.show();
Sounds.playButtonClick();
}
}
}
public void closeKeyBindingDialog() {
keyBindingDialog.close();
}
/**
* Show a snackbar at the bottom of the app for 1 second.
*