Update the board on all input events

This commit is contained in:
Charles Gould 2015-04-18 17:08:09 -04:00
parent a16d4a6def
commit b2b7369b93

View File

@ -107,10 +107,8 @@ public class GameCanvas extends Canvas {
if (e.isControlDown()) { if (e.isControlDown()) {
if (e.getCode() == KeyCode.Y) { if (e.getCode() == KeyCode.Y) {
game.redo(); game.redo();
updateView();
} else if (e.getCode() == KeyCode.Z) { } else if (e.getCode() == KeyCode.Z) {
game.undo(); game.undo();
updateView();
} }
} else { } else {
if (e.getCode() == KeyCode.F2) { if (e.getCode() == KeyCode.F2) {
@ -120,11 +118,11 @@ public class GameCanvas extends Canvas {
fromPile.toggleSelected(); fromPile.toggleSelected();
} }
fromPile = null; fromPile = null;
}
}
updateView(); updateView();
} }
} }
}
}
private class MouseClickHandler implements EventHandler<MouseEvent> { private class MouseClickHandler implements EventHandler<MouseEvent> {
@Override @Override
@ -135,6 +133,7 @@ public class GameCanvas extends Canvas {
fromPile.toggleSelected(); fromPile.toggleSelected();
} }
fromPile = null; fromPile = null;
updateView();
return; return;
} }
if (fromPile == null) { if (fromPile == null) {
@ -148,20 +147,20 @@ public class GameCanvas extends Canvas {
fromPile.toggleSelected(); fromPile.toggleSelected();
for (int i = 4; i < 8; i++) { for (int i = 4; i < 8; i++) {
if (game.tryMove(fromPile.getPile(), pileViews[i].getPile())) { if (game.tryMove(fromPile.getPile(), pileViews[i].getPile())) {
updateView();
checkEndingConditions(); checkEndingConditions();
break; break;
} }
} }
fromPile = null; fromPile = null;
updateView();
} else { } else {
// Try moving to other cell. // Try moving to other cell.
fromPile.toggleSelected(); fromPile.toggleSelected();
if (game.tryMove(fromPile.getPile(), clickedPile.getPile())) { if (game.tryMove(fromPile.getPile(), clickedPile.getPile())) {
updateView();
checkEndingConditions(); checkEndingConditions();
} }
fromPile = null; fromPile = null;
updateView();
} }
} }
} }