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

Changed references to OldGuiNewGame preference components to reference the actual ForgePreferences class hosted in Singletons.

Browse Source
This commit is contained in:
Rob Cashwalker
2011-09-13 19:12:55 +00:00
parent 7af71aac7d
commit 5e5e3690d2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/arcane/ui/CardPanel.java
View File

@@ -5,7 +5,7 @@ import arcane.ui.ScaledImagePanel.ScalingType;
import arcane.ui.util.GlowText; import arcane.ui.util.GlowText;
import arcane.ui.util.ManaSymbols; import arcane.ui.util.ManaSymbols;
import forge.*; import forge.*;
import forge.view.swing.OldGuiNewGame; //import forge.view.swing.OldGuiNewGame;
import javax.swing.*; import javax.swing.*;
import java.awt.Color; import java.awt.Color;
@@ -445,7 +445,9 @@ public class CardPanel extends JPanel implements CardContainer {
* @param card a {@link forge.Card} object. * @param card a {@link forge.Card} object.
*/ */
public void setText(Card card) { public void setText(Card card) {
if (card == null || !OldGuiNewGame.cardOverlay.isSelected()) return; if (card == null || !Singletons.getModel().getPreferences().cardOverlay)
return;
if (card.isFaceDown()) { if (card.isFaceDown()) {
titleText.setText(""); titleText.setText("");
showCastingCost = false; showCastingCost = false;
@@ -482,7 +484,7 @@ public class CardPanel extends JPanel implements CardContainer {
Insets i = getInsets(); Insets i = getInsets();
Image image = card == null ? null : ImageCache.getImage(card, getWidth() - i.left - i.right, getHeight() Image image = card == null ? null : ImageCache.getImage(card, getWidth() - i.left - i.right, getHeight()
- i.top - i.bottom); - i.top - i.bottom);
if (gameCard != null && OldGuiNewGame.cardOverlay.isSelected()) { if (gameCard != null && Singletons.getModel().getPreferences().cardOverlay) {
setText(gameCard); setText(gameCard);
} }