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

Issue 187 - You win - window covers the booster select window

Browse Source 
- changed setAlwaysOnTop() to toFront()
Issue 188 - Window title text truncated in *Choose a format of cards for the pr...* window
- Shortened window title to fit
This commit is contained in:
Rob Cashwalker
2011-08-29 04:04:34 +00:00
parent d7360b539e
commit d5db85d7f1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/GameAction.java
View File

@@ -639,7 +639,8 @@ public class GameAction {
frame.setEnabled(false); frame.setEnabled(false);
//frame.dispose(); //frame.dispose();
Gui_WinLose gwl = new Gui_WinLose( AllZone.getMatchState(), AllZone.getQuestData(), AllZone.getQuestAssignment() ); Gui_WinLose gwl = new Gui_WinLose( AllZone.getMatchState(), AllZone.getQuestData(), AllZone.getQuestAssignment() );
gwl.setAlwaysOnTop(true); //gwl.setAlwaysOnTop(true);
gwl.toFront();
return; return;
} }

3
src/main/java/forge/Gui_WinLose.java
View File

@@ -390,7 +390,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
protected void giveBooster() protected void giveBooster()
{ {
String[] boosterTypes = {"Legacy", "Extended", "Standard"}; String[] boosterTypes = {"Legacy", "Extended", "Standard"};
String boosterType = GuiUtils.getChoice("Choose a format of cards for the prize booster", boosterTypes); String boosterType = GuiUtils.getChoice("Choose prize booster format", boosterTypes);
List<String> setsToGive = null; List<String> setsToGive = null;
if (boosterTypes[2].equals(boosterType)) { // T2 if (boosterTypes[2].equals(boosterType)) { // T2
setsToGive = new ArrayList<String>(); setsToGive = new ArrayList<String>();
@@ -405,6 +405,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
ImageIcon icon = getIcon("BookIcon.png"); ImageIcon icon = getIcon("BookIcon.png");
CardListViewer c = new CardListViewer("Booster", "You have won the following new cards", cardsWon, icon); CardListViewer c = new CardListViewer("Booster", "You have won the following new cards", cardsWon, icon);
c.show(); c.show();
} }
protected void giveQuestRewards(final boolean wonMatch) { protected void giveQuestRewards(final boolean wonMatch) {

1
src/main/java/forge/gui/CardListViewer.java
View File

@@ -98,6 +98,7 @@ public class CardListViewer {
dialog.setSize(720,360); dialog.setSize(720,360);
dialog.addWindowFocusListener(new CardListFocuser()); dialog.addWindowFocusListener(new CardListFocuser());
dialog.setVisible(true); dialog.setVisible(true);
dialog.toFront();
dialog.dispose(); dialog.dispose();
called = true; called = true;