github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made the storm counter more visible.

Browse source
This commit is contained in:
LevelX2 2015-02-27 01:08:08 +01:00
parent 6f6b35d40f
commit fa59699769
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@
*/ */
package mage.client.game; package mage.client.game;
import com.sun.java.swing.plaf.windows.WindowsBorders;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
@ -606,7 +607,14 @@ public final class GamePanel extends javax.swing.JPanel {
else { else {
this.txtStep.setText(""); this.txtStep.setText("");
} }
this.txtPhasesBottomInfo.setText(" " + (game.getSpellsCastCurrentTurn() > 0 ? Integer.toString(game.getSpellsCastCurrentTurn()):"")); if (game.getSpellsCastCurrentTurn() > 0) {
this.phasesBottomPanel.setVisible(true);
this.txtPhasesBottomInfo.setText(Integer.toString(game.getSpellsCastCurrentTurn()));
} else {
this.phasesBottomPanel.setVisible(false);
this.txtPhasesBottomInfo.setText("");
}
this.txtActivePlayer.setText(game.getActivePlayerName()); this.txtActivePlayer.setText(game.getActivePlayerName());
this.txtPriority.setText(game.getPriorityPlayerName()); this.txtPriority.setText(game.getPriorityPlayerName());
this.txtTurn.setText(Integer.toString(game.getTurn())); this.txtTurn.setText(Integer.toString(game.getTurn()));
@ -1508,8 +1516,9 @@ public final class GamePanel extends javax.swing.JPanel {
phasesContainer.add(empty1, ratio); phasesContainer.add(empty1, ratio);
phasesContainer.add(jPhases); phasesContainer.add(jPhases);
JPanel phasesBottomPanel = new JPanel(); phasesBottomPanel = new JPanel();
phasesBottomPanel.setBackground(new Color(0, 0, 0, 0)); phasesBottomPanel.setBackground(Color.LIGHT_GRAY);
phasesBottomPanel.setBorder(new LineBorder(Color.DARK_GRAY, 2));
phasesBottomPanel.add(txtPhasesBottomInfo); phasesBottomPanel.add(txtPhasesBottomInfo);
phasesContainer.add(phasesBottomPanel); phasesContainer.add(phasesBottomPanel);
@ -1862,6 +1871,7 @@ public final class GamePanel extends javax.swing.JPanel {
private javax.swing.JSplitPane jSplitPane2; private javax.swing.JSplitPane jSplitPane2;
private JPanel jPhases; private JPanel jPhases;
private JPanel phasesContainer; private JPanel phasesContainer;
private JPanel phasesBottomPanel;
private javax.swing.JLabel txtPhasesBottomInfo; private javax.swing.JLabel txtPhasesBottomInfo;
private HoverButton currentStep; private HoverButton currentStep;