Fixed issue that when go back to start screen, start view doesn't fit

in to the decorator properly.

- Moved start screen view initialization logic into ViewManager.
- When go back to start screen view, a new stage within the start screen
view will be initialized.

#story[1245]
This commit is contained in:
Haoming Yin
2017-09-10 12:43:17 +12:00
parent 1516e817b7
commit 717f7558d9
5 changed files with 56 additions and 41 deletions
@@ -16,6 +16,7 @@ import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.Pane;
import seng302.gameServer.GameStages;
import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread;
import seng302.gameServer.ServerDescription;
@@ -437,6 +438,7 @@ public class GameClient {
}
public void stopGame() {
GameState.setCurrentStage(GameStages.CANCELLED);
if (server != null) server.terminate();
if (socketThread != null) socketThread.setSocketToClose();
}