Multiple fixes.

- Make determination of card viewing permissions much faster;
- A general fix related to choosing a fixed amount of options from a list;
- Improve display of card's names;
- Reduce card flickering when changing phases.
This commit is contained in:
elcnesh
2014-09-28 15:43:34 +00:00
parent 6969aaad91
commit e44b4b3cbc
20 changed files with 111 additions and 120 deletions

View File

@@ -10,11 +10,13 @@ import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.util.Collection;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import forge.assets.FSkinProp;
@@ -145,11 +147,7 @@ public class GuiDesktop implements IGuiBase {
}
@Override
public <T> T showInputDialog(String message, String title, FSkinProp icon, T initialInput, T[] inputOptions) {
if (initialInput instanceof GameObject || (inputOptions != null && inputOptions.length > 0 && inputOptions[0] instanceof GameObject)) {
System.err.println("Warning: GameObject passed to GUI! Printing stack trace.");
Thread.dumpStack();
}
public String showInputDialog(String message, String title, FSkinProp icon, String initialInput, String[] inputOptions) {
return FOptionPane.showInputDialog(message, title, icon == null ? null : FSkin.getImage(icon), initialInput, inputOptions);
}