github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 19:25:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed that the storm counter was no shown on the game panel.

Browse source
This commit is contained in:
LevelX2 2016-03-06 02:06:10 +01:00
parent dd9431c8ea
commit e29c4c3516
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -413,6 +413,8 @@ public final class GamePanel extends javax.swing.JPanel {
pnlShortCuts.setMinimumSize(newDimension); pnlShortCuts.setMinimumSize(newDimension);
pnlShortCuts.setMaximumSize(newDimension); pnlShortCuts.setMaximumSize(newDimension);
txtSpellsCast.setFont(new Font(GUISizeHelper.gameDialogAreaFont.getFontName(), Font.BOLD, GUISizeHelper.gameDialogAreaFont.getSize()));
GUISizeHelper.changePopupMenuFont(popupMenuTriggerOrder); GUISizeHelper.changePopupMenuFont(popupMenuTriggerOrder);
} }
@ -1259,8 +1261,6 @@ public final class GamePanel extends javax.swing.JPanel {
feedbackPanel = new mage.client.game.FeedbackPanel(); feedbackPanel = new mage.client.game.FeedbackPanel();
txtSpellsCast = new javax.swing.JLabel(); txtSpellsCast = new javax.swing.JLabel();
Font font = new Font("SansSerif", Font.BOLD, 12);
txtSpellsCast.setFont(font);
Border paddingBorder = BorderFactory.createEmptyBorder(4, 4, 4, 4); Border paddingBorder = BorderFactory.createEmptyBorder(4, 4, 4, 4);
Border border = BorderFactory.createLineBorder(Color.DARK_GRAY, 2); Border border = BorderFactory.createLineBorder(Color.DARK_GRAY, 2);
txtSpellsCast.setBorder(BorderFactory.createCompoundBorder(border, paddingBorder)); txtSpellsCast.setBorder(BorderFactory.createCompoundBorder(border, paddingBorder));

2
Mage.Common/src/mage/view/GameView.java
View file

@ -195,7 +195,7 @@ public class GameView implements Serializable {
this.special = false; this.special = false;
} }
CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher"); CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get(CastSpellLastTurnWatcher.class.getName());
if (watcher != null) { if (watcher != null) {
spellsCastCurrentTurn = watcher.getAmountOfSpellsAllPlayersCastOnCurrentTurn(); spellsCastCurrentTurn = watcher.getAmountOfSpellsAllPlayersCastOnCurrentTurn();
} else { } else {