Fixed: Maximize(windows)
This commit is contained in:
@@ -77,6 +77,8 @@ public class GUI extends Application implements IView {
|
|||||||
mainScene = new Scene(loaderMain.load());
|
mainScene = new Scene(loaderMain.load());
|
||||||
controllerMain = loaderMain.getController();
|
controllerMain = loaderMain.getController();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
showLogin();
|
showLogin();
|
||||||
stage.setTitle("Mesos");
|
stage.setTitle("Mesos");
|
||||||
primaryStage.setMaximized(true);
|
primaryStage.setMaximized(true);
|
||||||
@@ -99,42 +101,46 @@ public class GUI extends Application implements IView {
|
|||||||
this.controller=controller;
|
this.controller=controller;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void applyAndRender(NetworkEvent event) {
|
public void applyAndRender(NetworkEvent event) {
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
event.apply(miniModel);
|
event.apply(miniModel);
|
||||||
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
|
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
|
||||||
controllerTotem.render();
|
|
||||||
primaryStage.setScene(totemScene);
|
primaryStage.setScene(totemScene);
|
||||||
primaryStage.setMaximized(true);
|
controllerTotem.render();
|
||||||
}
|
} else if (controller.miniModel.currentState.getGameStage() == GameStages.ENDED) {
|
||||||
else if (controller.miniModel.currentState.getGameStage() == GameStages.ENDED) {
|
boolean sceneChange = primaryStage.getScene() != leaderboardScene;
|
||||||
controllerLeaderboard.render();
|
|
||||||
primaryStage.setScene(leaderboardScene);
|
primaryStage.setScene(leaderboardScene);
|
||||||
primaryStage.setMaximized(true);
|
if (sceneChange) {
|
||||||
|
primaryStage.setMaximized(false);
|
||||||
|
Platform.runLater(() -> primaryStage.setMaximized(true));
|
||||||
|
}
|
||||||
|
controllerLeaderboard.render();
|
||||||
} else {
|
} else {
|
||||||
controllerMain.render(event);
|
boolean sceneChange = primaryStage.getScene() != mainScene; // ← era un'altra scena?
|
||||||
primaryStage.setScene(mainScene);
|
primaryStage.setScene(mainScene);
|
||||||
primaryStage.setMaximized(true);
|
if (sceneChange) {
|
||||||
|
primaryStage.setMaximized(false);
|
||||||
|
Platform.runLater(() -> primaryStage.setMaximized(true));
|
||||||
|
}
|
||||||
|
controllerMain.render(event);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void render() {
|
public void render() {
|
||||||
if (!Platform.isFxApplicationThread()) {
|
if (!Platform.isFxApplicationThread()) {
|
||||||
Platform.runLater(this::render);
|
Platform.runLater(this::render);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
|
if (controller.miniModel.currentState.getGameStage() == TOTEM_CHOICE) {
|
||||||
controllerTotem.render();
|
|
||||||
primaryStage.setScene(totemScene);
|
primaryStage.setScene(totemScene);
|
||||||
primaryStage.setMaximized(true);
|
controllerTotem.render();
|
||||||
} else {
|
} else {
|
||||||
controllerMain.render();
|
|
||||||
primaryStage.setScene(mainScene);
|
primaryStage.setScene(mainScene);
|
||||||
primaryStage.setMaximized(true);
|
controllerMain.render();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void showMessage(String message) {
|
public void showMessage(String message) {
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,10 @@ public class MainFXMLController {
|
|||||||
|
|
||||||
// ==== RENDER ====
|
// ==== RENDER ====
|
||||||
public void render() {
|
public void render() {
|
||||||
|
if (mainHBox.getWidth() == 0 || mainHBox.getHeight() == 0) {
|
||||||
|
Platform.runLater(() -> render());
|
||||||
|
return;
|
||||||
|
}
|
||||||
renderUpper();
|
renderUpper();
|
||||||
renderBoard();
|
renderBoard();
|
||||||
renderLower();
|
renderLower();
|
||||||
@@ -103,6 +107,10 @@ public class MainFXMLController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void render(NetworkEvent event) {
|
public void render(NetworkEvent event) {
|
||||||
|
if (mainHBox.getWidth() == 0 || mainHBox.getHeight() == 0) {
|
||||||
|
Platform.runLater(() -> render(event));
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (event.getEventType() == EventType.SLOT_CHOICE) {
|
if (event.getEventType() == EventType.SLOT_CHOICE) {
|
||||||
renderBoard();
|
renderBoard();
|
||||||
renderSidePanel();
|
renderSidePanel();
|
||||||
@@ -323,9 +331,10 @@ public class MainFXMLController {
|
|||||||
if (!cardList.isEmpty()) {
|
if (!cardList.isEmpty()) {
|
||||||
StackPane img = createCard(cardList.getLast(), true, true, parent);
|
StackPane img = createCard(cardList.getLast(), true, true, parent);
|
||||||
Label label = new Label(String.valueOf(cardList.size()));
|
Label label = new Label(String.valueOf(cardList.size()));
|
||||||
|
label.setTranslateY(-55);
|
||||||
|
label.setTranslateX(10);
|
||||||
label.getStyleClass().add("label-large");
|
label.getStyleClass().add("label-large");
|
||||||
StackPane.setAlignment(label, Pos.TOP_RIGHT);
|
StackPane.setAlignment(label, Pos.TOP_RIGHT);
|
||||||
StackPane.setMargin(label, new Insets(8, 8, 0, 0));
|
|
||||||
img.getChildren().add(label);
|
img.getChildren().add(label);
|
||||||
img.setOnMouseClicked(e -> openPopup(new ArrayList<>(cardList)));
|
img.setOnMouseClicked(e -> openPopup(new ArrayList<>(cardList)));
|
||||||
parent.getChildren().add(img);
|
parent.getChildren().add(img);
|
||||||
|
|||||||
Reference in New Issue
Block a user