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

Win/lose screen: continue/restart bug fixed.

Browse Source
This commit is contained in:
Doublestrike
2011-11-29 10:10:47 +00:00
parent 2446467752
commit 8f88461e43
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/forge/view/toolbox/WinLoseFrame.java
View File

@@ -37,6 +37,7 @@ import forge.AllZone;
import forge.Constant;
import forge.Phase;
import forge.Player;
import forge.control.ControlAllUI;
import forge.control.ControlWinLose;
import forge.properties.ForgeProps;
import forge.properties.NewConstants.Lang.WinLoseFrame.WinLoseText;
@@ -242,6 +243,14 @@ public class WinLoseFrame extends JFrame {
*/
final void btnContinueActionPerformed(final ActionEvent e) {
this.closeWinLoseFrame();
// Instantiate a new ControlAllUI if using new UI.
if (!Constant.Runtime.OLDGUI[0]) {
final ControlAllUI ui = new ControlAllUI();
AllZone.setDisplay(ui.getMatchView());
ui.getMatchController().initMatch();
}
AllZone.getDisplay().setVisible(true);
this.modeHandler.startNextRound();
}
@@ -256,6 +265,14 @@ public class WinLoseFrame extends JFrame {
*/
final void btnRestartActionPerformed(final ActionEvent e) {
this.closeWinLoseFrame();
// Instantiate a new ControlAllUI if using new UI.
if (!Constant.Runtime.OLDGUI[0]) {
final ControlAllUI ui = new ControlAllUI();
AllZone.setDisplay(ui.getMatchView());
ui.getMatchController().initMatch();
}
AllZone.getDisplay().setVisible(true);
this.matchState.reset();
this.modeHandler.startNextRound();
@@ -288,7 +305,7 @@ public class WinLoseFrame extends JFrame {
*
* @return {@link javax.swing.JFrame} display frame
*/
final JFrame closeWinLoseFrame() {
private void closeWinLoseFrame() {
JFrame frame;
// Issue 147 - keep battlefield up following win/loss
@@ -302,7 +319,6 @@ public class WinLoseFrame extends JFrame {
frame.dispose();
frame.setEnabled(true);
this.dispose();
return frame;
}
/**