From e5daea35cce2eaedf35300ec5b6482aa802ee285 Mon Sep 17 00:00:00 2001 From: Tor Martin Wang Date: Fri, 17 Apr 2020 15:34:17 +0200 Subject: [PATCH] Added loading text when you enter a tournament from the tournament list --- .../states/CreateJoinTournamentState.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java index b045436..6fe1e43 100644 --- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java @@ -70,6 +70,10 @@ public class CreateJoinTournamentState extends State { private boolean includeCheckboxClicked = false; private boolean leaveConfirmed = false; private boolean joinButtonClicked = false; + private boolean enterButtonClicked = false; + private Tournament enteredTournament; + private Round enteredRound; + private LoadingText loadingText = new LoadingText(); public CreateJoinTournamentState(GameStateManager gsm) { @@ -293,6 +297,14 @@ public class CreateJoinTournamentState extends State { this.joinButtonClicked = false; } + // User pressed the enter tournament button + if(this.enterButtonClicked && this.loadingText.textIsRendering()){ + this.handleEnterBtnClick(this.enteredTournament, this.enteredRound); + this.enterButtonClicked = false; + this.enteredTournament = null; + this.enteredRound = null; + } + this.loadingText.update(dt); } @@ -319,6 +331,13 @@ public class CreateJoinTournamentState extends State { this.loadingText.setLoading(); } + private void setEnterButtonClicked(Tournament clickedTournament, Round enteredRound){ + this.enterButtonClicked = true; + this.enteredTournament = clickedTournament; + this.enteredRound = enteredRound; + this.loadingText.setLoading(); + } + // Handle click methods @@ -405,7 +424,7 @@ public class CreateJoinTournamentState extends State { } public void clicked(InputEvent event, float x, float y) { - handleEnterBtnClick(tournament, round); + setEnterButtonClicked(tournament, round); }; } -- GitLab