From d5db85d7f1cbb7bb29d2de02bf31bb184bb9bdfb Mon Sep 17 00:00:00 2001
From: Rob Cashwalker <rob.cashwalker@cardforge.org>
Date: Mon, 29 Aug 2011 04:04:34 +0000
Subject: [PATCH] Issue 187 - You win - window covers the booster select window
 - 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

---
 src/main/java/forge/GameAction.java         | 3 ++-
 src/main/java/forge/Gui_WinLose.java        | 3 ++-
 src/main/java/forge/gui/CardListViewer.java | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 7c44e18b403..0cf47f8f8ff 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -639,7 +639,8 @@ public class GameAction {
             frame.setEnabled(false);
             //frame.dispose();
             Gui_WinLose gwl = new Gui_WinLose( AllZone.getMatchState(), AllZone.getQuestData(), AllZone.getQuestAssignment() );
-            gwl.setAlwaysOnTop(true);
+            //gwl.setAlwaysOnTop(true);
+            gwl.toFront();
             return;
         }
 
diff --git a/src/main/java/forge/Gui_WinLose.java b/src/main/java/forge/Gui_WinLose.java
index 92f1540e535..8f78b51b0f4 100644
--- a/src/main/java/forge/Gui_WinLose.java
+++ b/src/main/java/forge/Gui_WinLose.java
@@ -390,7 +390,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
     protected void giveBooster()
     {
         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;
         if (boosterTypes[2].equals(boosterType)) { // T2
             setsToGive = new ArrayList<String>();
@@ -405,6 +405,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
         ImageIcon icon = getIcon("BookIcon.png");
         CardListViewer c = new CardListViewer("Booster", "You have won the following new cards", cardsWon, icon);
         c.show();
+        
     }
 
     protected void giveQuestRewards(final boolean wonMatch) {
diff --git a/src/main/java/forge/gui/CardListViewer.java b/src/main/java/forge/gui/CardListViewer.java
index 958de406017..ba6a966b67c 100644
--- a/src/main/java/forge/gui/CardListViewer.java
+++ b/src/main/java/forge/gui/CardListViewer.java
@@ -98,6 +98,7 @@ public class CardListViewer {
         dialog.setSize(720,360);
         dialog.addWindowFocusListener(new CardListFocuser());
         dialog.setVisible(true);
+        dialog.toFront();
         
         dialog.dispose();
         called = true;