external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix animation for new conquest screen

Browse Source
This commit is contained in:
drdev
2016-02-01 03:45:42 +00:00
parent ca54a81cd0
commit 5d48f4fa21
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
View File

@@ -73,9 +73,9 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
setCurrentStep(newIndex); setCurrentStep(newIndex);
} }
private void setCurrentStep(int index) { private boolean setCurrentStep(int index) {
if (currentStep != null) { if (currentStep != null) {
if (currentStep.index == index) { return; } if (currentStep.index == index) { return false; }
currentStep.setVisible(false); currentStep.setVisible(false);
if (currentStep.index == steps.length - 1) { if (currentStep.index == steps.length - 1) {
@@ -95,6 +95,7 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
if (Forge.getCurrentScreen() == this) { if (Forge.getCurrentScreen() == this) {
currentStep.onActivate(model); currentStep.onActivate(model);
} }
return true;
} }
@Override @Override
@@ -103,7 +104,9 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
for (WizardStep<T> step : steps) { for (WizardStep<T> step : steps) {
step.reset(); step.reset();
} }
setCurrentStep(0); if (!setCurrentStep(0)) {
currentStep.onActivate(model); //ensure first step activated even if already selected
}
} }
protected abstract void finish(); protected abstract void finish();