From 42aa5bca8984c4a6438fef69bdcea80955f993e1 Mon Sep 17 00:00:00 2001 From: Andreas Weninger <e01526989@student.tuwien.ac.at> Date: Thu, 14 Jun 2018 12:00:09 +0200 Subject: Hotfix: Nothing was clickable before closing a subwindow. --- .../einsatzverwaltung/controller/CreateOperationController.java | 1 + src/main/resources/fxml/CreateOperationController.fxml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java index 3977629..edc56e7 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java @@ -109,6 +109,7 @@ public class CreateOperationController { } }); + setVisible(true); createCarController.setVisible(false); registrationWindowController.setVisible(false); } diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 8f1e3c3..05b06bc 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -84,14 +84,15 @@ <AnchorPane fx:id="apInvisible" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.bottomAnchor="0" style="-fx-background-color: rgba(0,0,0,0.7);" visible="false"/> - <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" - AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/> - <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees" - source="/fxml/manageEmployees.fxml"/> + <GridPane fx:id="grdWindowContainer" AnchorPane.topAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.bottomAnchor="0" alignment="CENTER"> <fx:include source="/fxml/RegistrationWindow.fxml" fx:id="registrationWindow"/> </GridPane> + <fx:include fx:id="operationDetails" source="/fxml/OperationDetails.fxml" + AnchorPane.leftAnchor="54.0" AnchorPane.topAnchor="50.0"/> + <fx:include AnchorPane.leftAnchor="192.0" AnchorPane.topAnchor="57.0" fx:id="manageEmployees" + source="/fxml/manageEmployees.fxml"/> <fx:include AnchorPane.leftAnchor="300.0" AnchorPane.topAnchor="125.0" source="/fxml/createCar.fxml" fx:id="createCar"/> <fx:include AnchorPane.leftAnchor="100.0" source="/fxml/ArchiveOperation.fxml" -- cgit v1.2.3-70-g09d2