diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 1f0d743..b10876f 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java index 93a33e8..e762e21 100644 --- a/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java +++ b/src/main/java/it/polimi/ingsw/gc14/View/GUI/MainFXMLController.java @@ -272,9 +272,9 @@ public class MainFXMLController { private void renderPlayer(Player player,VBox target) { VBox card = new VBox(3); - VBox.setMargin(card, new Insets(15,15,15,15)); + VBox.setMargin(card, new Insets(0,15,0,15)); card.getStyleClass().add("player-card"); - card.setPadding(new Insets(8)); + card.setPadding(new Insets(4)); if(player.getUserName().equals(controller.miniModel.currentState.getCurrentPlayer().getUserName())) { ScaleTransition scaleUp = new ScaleTransition(Duration.millis(150), card); @@ -544,7 +544,7 @@ public class MainFXMLController { addHoverZoom(skipBtn); addHoverZoom(detailsBtn); - VBox playerList = new VBox(); + VBox playerList = new VBox(17); playerList.setFillWidth(true); for (Player p : controller.miniModel.players.values()) { renderPlayer(p, playerList); @@ -630,7 +630,7 @@ public class MainFXMLController { } showPopup(); } - @FXML + private void openDetailsPopup() { popupCards.getChildren().clear(); ImageView img = new ImageView(loadImage("/GUIImages/Backs/back-118.png")); diff --git a/src/main/resources/GUIScene/main.fxml b/src/main/resources/GUIScene/main.fxml index aac96d5..e621d4c 100644 --- a/src/main/resources/GUIScene/main.fxml +++ b/src/main/resources/GUIScene/main.fxml @@ -5,6 +5,7 @@ + + HBox.hgrow="NEVER"> @@ -29,7 +30,7 @@ - + @@ -48,8 +49,7 @@ - - + - + + + + + + +